Restructure OSGi launching

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.activemq / src / main / java / org / argeo / slc / jms / JmsAttachmentListener.java

diff --git a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAttachmentListener.java b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAttachmentListener.java
index 46e828060b2f08cfe2b7eea795e8db81b4afe377..8b91e7697093dfdd6c4bd0e4a1be824cb3ff6f91 100644 (file)
--- a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAttachmentListener.java
+++ b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAttachmentListener.java
@@ -30,15 +30,23 @@ public class JmsAttachmentListener implements MessageListener {
                                        .setContentType(msg
                                                        .getStringProperty(JmsAttachmentUploader.ATTACHMENT_CONTENT_TYPE));
 
-                       byte[] buffer = new byte[(int) message.getBodyLength()];
+                       // Check body length
+                       Long bodyLength = message.getBodyLength();
+                       if (bodyLength > Integer.MAX_VALUE)
+                               throw new SlcException("Attachment cannot be bigger than "
+                                               + Integer.MAX_VALUE
+                                               + " bytes with this transport. Use another transport.");
+
+                       byte[] buffer = new byte[bodyLength.intValue()];
                        message.readBytes(buffer);
                        in = new ByteArrayInputStream(buffer);
                        attachmentsStorage.storeAttachment(attachment, in);
                } catch (JMSException e) {
                        throw new SlcException("Could not process attachment message "
                                        + msg, e);
+               } finally {
+                       IOUtils.closeQuietly(in);
                }
-               IOUtils.closeQuietly(in);
        }
 
        public void setAttachmentsStorage(AttachmentsStorage attachmentsStorage) {