You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by lh...@apache.org on 2008/02/26 19:48:54 UTC

svn commit: r631332 - in /servicemix/smx3/branches/servicemix-3.1/core/servicemix-core/src: main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java test/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImplTest.java

Author: lhein
Date: Tue Feb 26 10:48:46 2008
New Revision: 631332

URL: http://svn.apache.org/viewvc?rev=631332&view=rev
Log:
- changed the getAttachment(String id) method to behave JBI compliant (see SM-1186 by Alex Vidgor)
- added a testcase for this issue

Added:
    servicemix/smx3/branches/servicemix-3.1/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImplTest.java
Modified:
    servicemix/smx3/branches/servicemix-3.1/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java

Modified: servicemix/smx3/branches/servicemix-3.1/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.1/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java?rev=631332&r1=631331&r2=631332&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.1/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java (original)
+++ servicemix/smx3/branches/servicemix-3.1/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java Tue Feb 26 10:48:46 2008
@@ -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;

Added: servicemix/smx3/branches/servicemix-3.1/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImplTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.1/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImplTest.java?rev=631332&view=auto
==============================================================================
--- servicemix/smx3/branches/servicemix-3.1/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImplTest.java (added)
+++ servicemix/smx3/branches/servicemix-3.1/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImplTest.java Tue Feb 26 10:48:46 2008
@@ -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"));
+    }
+}