From e4ad261e39469c93a617b9d382f545d12114b323 Mon Sep 17 00:00:00 2001 From: Ben Steffensmeier Date: Thu, 25 Apr 2013 14:39:17 -0500 Subject: [PATCH] Issue #1954 Size Collections better. Former-commit-id: 9e0607605dd8f5d98ba7b7956e1eecd812f679c7 [formerly 496b846599e9ca243533d45045e9a77dd2171b58] [formerly 9635b47f7b96153a612261faf3c3c559d129324b [formerly b02f94ffa96e31218800a4fef9fff3842a47a0a9]] [formerly ead691fcbe997b571f018e209db44647ce55881f [formerly b02f94ffa96e31218800a4fef9fff3842a47a0a9 [formerly 4cc9fd532fb29204412247b4bd22222583db8563]]] Former-commit-id: ead691fcbe997b571f018e209db44647ce55881f Former-commit-id: 2aa754440264b98622491a6e86ee7d0625e01456 [formerly e3e450595f47f40aadbc287a132561bec6c79f9d] Former-commit-id: e3613eca30f09e2a2a654ee0afa271893bc96c3f --- .../serialization/thrift/ThriftSerializationContext.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/thrift/ThriftSerializationContext.java b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/thrift/ThriftSerializationContext.java index c2b41b87b1..58f3bb8c8e 100644 --- a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/thrift/ThriftSerializationContext.java +++ b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/thrift/ThriftSerializationContext.java @@ -66,6 +66,7 @@ import com.raytheon.uf.common.serialization.SerializationException; * Sep 14, 2012 #1169 djohnson Add ability to write another object into the stream directly. * Sep 28, 2012 #1195 djohnson Add ability to specify adapter at field level. * Nov 02, 2012 1302 djohnson No more field level adapters. + * Apr 25, 2013 1954 bsteffen Size Collections better. * * * @@ -946,7 +947,7 @@ public class ThriftSerializationContext extends BaseSerializationContext { if (map == null) { // assume hashmap if nothing else available - map = new HashMap(tmap.size); + map = new HashMap((int) (tmap.size / 0.75) + 1, 0.75f); } for (int i = 0; i < tmap.size; i++) { @@ -995,7 +996,7 @@ public class ThriftSerializationContext extends BaseSerializationContext { if (set == null) { // assume hashset if nothing else available - set = new HashSet(tset.size); + set = new HashSet((int) (tmap.size / 0.75) + 1, 0.75f); } for (int i = 0; i < tset.size; i++) { @@ -1175,7 +1176,7 @@ public class ThriftSerializationContext extends BaseSerializationContext { } } if (list == null) { - list = new ArrayList(); + list = new ArrayList(innerList.size); } for (int i = 0; i < innerList.size; i++) { list.add(readString()); @@ -1213,7 +1214,7 @@ public class ThriftSerializationContext extends BaseSerializationContext { } if (list == null) { - list = new ArrayList(); + list = new ArrayList(innerList.size); } for (int i = 0; i < innerList.size; i++) { list.add(this.serializationManager.deserialize(this));