From 6f0a3355c40db0d5d90887f4238ff99c26fcf87d Mon Sep 17 00:00:00 2001 From: "Timothy A. Bish" Date: Fri, 16 Nov 2012 21:44:59 +0000 Subject: [PATCH] update for: https://issues.apache.org/jira/browse/AMQ-4180 remove debug code git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1410583 13f79535-47bb-0310-9956-ffa450edef68 --- .../activemq/util/MarshallingSupport.java | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/activemq-client/src/main/java/org/apache/activemq/util/MarshallingSupport.java b/activemq-client/src/main/java/org/apache/activemq/util/MarshallingSupport.java index 1ccaebe67b..d7c10b2283 100755 --- a/activemq-client/src/main/java/org/apache/activemq/util/MarshallingSupport.java +++ b/activemq-client/src/main/java/org/apache/activemq/util/MarshallingSupport.java @@ -96,7 +96,6 @@ public final class MarshallingSupport { } return rc; } - } public static void marshalPrimitiveList(List list, DataOutputStream out) throws IOException { @@ -183,25 +182,17 @@ public final class MarshallingSupport { in.readFully((byte[])value); break; case STRING_TYPE: { - if (true) { - int length = in.readUnsignedShort(); - byte data[] = new byte[length]; - in.readFully(data); - value = new UTF8Buffer(data); - } else { - value = in.readUTF(); - } + int length = in.readUnsignedShort(); + byte data[] = new byte[length]; + in.readFully(data); + value = new UTF8Buffer(data); break; } case BIG_STRING_TYPE: { - if (true) { - int length = in.readInt(); - byte data[] = new byte[length]; - in.readFully(data); - value = new UTF8Buffer(data); - } else { - value = readUTF8(in); - } + int length = in.readInt(); + byte data[] = new byte[length]; + in.readFully(data); + value = new UTF8Buffer(data); break; } case MAP_TYPE: