You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2008/09/02 09:32:16 UTC

svn commit: r691134 - /servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java

Author: ffang
Date: Tue Sep  2 00:32:15 2008
New Revision: 691134

URL: http://svn.apache.org/viewvc?rev=691134&view=rev
Log:
[SM-1526]revert previous change

Modified:
    servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java

Modified: servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java?rev=691134&r1=691133&r2=691134&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java Tue Sep  2 00:32:15 2008
@@ -21,7 +21,6 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serializable;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -313,10 +312,7 @@
         try {
             convertAttachments();
             out.writeObject(attachments);
-            //since we can't guarantee all properties is Serializable, so only write the
-            //properties which is serializable to the external to avoid NotSerializableException
-            Map serialiableProperties = getSeriableProperties(properties);
-            out.writeObject(serialiableProperties);
+            out.writeObject(properties);
             String src = TRANSFORMER.toString(content);
             out.writeObject(src);
             // We have read the source
@@ -330,18 +326,6 @@
         }
     }
 
-    private Map getSeriableProperties(Map originalProperties) {
-        if (originalProperties == null) {
-            return originalProperties;
-        }
-        Map ret = new HashMap();
-        for (Object key : originalProperties.keySet()) {
-            if (originalProperties.get(key) instanceof Serializable) {
-                ret.put(key, originalProperties.get(key));
-            }
-        }
-        return ret;
-    }
  
    
     private void convertAttachments() throws IOException {