activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r633571 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
Date Tue, 04 Mar 2008 17:55:11 GMT
Author: chirino
Date: Tue Mar  4 09:55:01 2008
New Revision: 633571

URL: http://svn.apache.org/viewvc?rev=633571&view=rev
Log:
Fixing edge case that does not normally occur.  When marshalling a null object and size prefixing
is disabled, we
were still prefixing the size of the data.


Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java?rev=633571&r1=633570&r2=633571&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
Tue Mar  4 09:55:01 2008
@@ -256,7 +256,9 @@
             }
 
         } else {
-            dataOut.writeInt(size);
+            if (!sizePrefixDisabled) {
+            	dataOut.writeInt(size);
+            }
             dataOut.writeByte(NULL_TYPE);
         }
     }



Mime
View raw message