svn commit: r740297 - in /camel/branches/camel-1.x: ./ camel-core/src/main/java/org/apache/camel/converter/jaxp/StringSource.java camel-core/src/main/java/org/apache/camel/converter/stream/StreamCacheConverter.java

[davsclaus]

Author: davsclaus
Date: Tue Feb  3 13:15:58 2009
New Revision: 740297

URL: http://svn.apache.org/viewvc?rev=740297&view=rev
Log:
Merged revisions 740295 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r740295 | davsclaus | 2009-02-03 14:10:32 +0100 (Tue, 03 Feb 2009) | 1 line
  
  CAMEL-1309: StringSource is not properly serializable handling null values. 
Thanks to gnodet for patch.
........

Modified:
    camel/branches/camel-1.x/   (props changed)
    
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/StringSource.java
    
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/stream/StreamCacheConverter.java

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  3 13:15:58 2009
@@ -1 +1 @@
-/camel/trunk:739733,739904,740251
+/camel/trunk:739733,739904,740251,740295

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/StringSource.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/StringSource.java?rev=740297&r1=740296&r2=740297&view=diff
==============================================================================
--- 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/StringSource.java
 (original)
+++ 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/StringSource.java
 Tue Feb  3 13:15:58 2009
@@ -99,16 +99,36 @@
     }
 
     public void writeExternal(ObjectOutput out) throws IOException {
-        out.writeUTF(text);
-        out.writeUTF(encoding);
-        out.writeUTF(getPublicId());
-        out.writeUTF(getSystemId());
+        int b = (text != null ? 0x01 : 0x00) + (encoding != null ? 0x02 : 0x00)
+                + (getPublicId() != null ? 0x04 : 0x00) + (getSystemId() != 
null ? 0x08 : 0x00);
+        out.writeByte(b);
+        if ((b & 0x01) != 0) {
+            out.writeUTF(text);
+        }
+        if ((b & 0x02) != 0) {
+            out.writeUTF(encoding);
+        }
+        if ((b & 0x04) != 0) {
+            out.writeUTF(getPublicId());
+        }
+        if ((b & 0x08) != 0) {
+            out.writeUTF(getSystemId());
+        }
     }
 
     public void readExternal(ObjectInput in) throws IOException, 
ClassNotFoundException {
-        text = in.readUTF();
-        encoding = in.readUTF();
-        setPublicId(in.readUTF());
-        setSystemId(in.readUTF());
+        int b = in.readByte();
+        if ((b & 0x01) != 0) {
+            text = in.readUTF();
+        }
+        if ((b & 0x02) != 0) {
+            encoding = in.readUTF();
+        }
+        if ((b & 0x04) != 0) {
+            setPublicId(in.readUTF());
+        }
+        if ((b & 0x08) != 0) {
+            setSystemId(in.readUTF());
+        }
     }
 }

Modified: 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/stream/StreamCacheConverter.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/stream/StreamCacheConverter.java?rev=740297&r1=740296&r2=740297&view=diff
==============================================================================
--- 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/stream/StreamCacheConverter.java
 (original)
+++ 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/stream/StreamCacheConverter.java
 Tue Feb  3 13:15:58 2009
@@ -83,6 +83,9 @@
 
         private static final long serialVersionUID = 4147248494104812945L;
 
+        public SourceCache() {
+        }
+
         public SourceCache(String text) {
             super(text);
         }