activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1428953 - /activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/MarshallingSupport.java
Date Fri, 04 Jan 2013 16:22:33 GMT
Author: tabish
Date: Fri Jan  4 16:22:32 2013
New Revision: 1428953

URL: http://svn.apache.org/viewvc?rev=1428953&view=rev
Log:
Fix broken unit test, openwire.v*.WireFormatInfoTest max property size not set correctly.


Modified:
    activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/MarshallingSupport.java

Modified: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/MarshallingSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/MarshallingSupport.java?rev=1428953&r1=1428952&r2=1428953&view=diff
==============================================================================
--- activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/MarshallingSupport.java
(original)
+++ activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/MarshallingSupport.java
Fri Jan  4 16:22:32 2013
@@ -80,7 +80,7 @@ public final class MarshallingSupport {
     }
 
     public static Map<String, Object> unmarshalPrimitiveMap(DataInputStream in, int
maxPropertySize) throws IOException {
-        return unmarshalPrimitiveMap(in, Integer.MAX_VALUE, false);
+        return unmarshalPrimitiveMap(in, maxPropertySize, false);
     }
 
     /**
@@ -106,7 +106,7 @@ public final class MarshallingSupport {
         }
     }
 
-    public static void marshalPrimitiveList(List list, DataOutputStream out) throws IOException
{
+    public static void marshalPrimitiveList(List<Object> list, DataOutputStream out)
throws IOException {
         out.writeInt(list.size());
         for (Object element : list) {
             marshalPrimitive(out, element);



Mime
View raw message