- changed the getAttachment(String id) method to behave JBI compliant (see SM-1186 by Alex Vidgor)
- added a testcase for this issue
git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx3/branches/servicemix-3.1@631332 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java b/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java
index 1a99688..14bc8e1 100644
--- a/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java
+++ b/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java
@@ -172,7 +172,7 @@
* @return the specified attachment
*/
public DataHandler getAttachment(String id) {
- if (attachments != null) {
+ if (attachments != null && attachments.get(id) != null) {
return new DataHandler((DataSource) attachments.get(id));
}
return null;
diff --git a/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImplTest.java b/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImplTest.java
new file mode 100644
index 0000000..4894e14
--- /dev/null
+++ b/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImplTest.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.servicemix.jbi.messaging;
+
+import javax.activation.DataHandler;
+import javax.jbi.messaging.NormalizedMessage;
+
+import junit.framework.TestCase;
+
+import org.apache.servicemix.jbi.util.ByteArrayDataSource;
+
+/**
+ * this test case is for normalized message impl class
+ *
+ * @author lhe
+ */
+public class NormalizedMessageImplTest extends TestCase {
+ /**
+ * getAttachment test method
+ *
+ * @throws Exception
+ */
+ public void testGetAttachment() throws Exception {
+ // testcase for SM-1186
+ DataHandler dh = new DataHandler(new ByteArrayDataSource("test".getBytes(), "test"));
+
+ // first test with existing attachments
+ MessageExchangeImpl inOnly = new InOnlyImpl("inonly");
+ NormalizedMessage msg = inOnly.createMessage();
+ msg.addAttachment("att_1", dh);
+ inOnly.setMessage(msg, "in");
+
+ assertNotNull(inOnly.getMessage("in").getAttachment("att_1"));
+ assertNull(inOnly.getMessage("in").getAttachment("att_2"));
+
+ // now test without attachments
+ inOnly.getMessage("in").removeAttachment("att_1");
+
+ assertNull(inOnly.getMessage("in").getAttachment("att_1"));
+ assertNull(inOnly.getMessage("in").getAttachment("att_2"));
+ }
+}
