Return-Path: 
 <commons-dev-return-70961-apmail-jakarta-commons-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org
Received: (qmail 2985 invoked from network); 7 May 2005 18:04:43 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 7 May 2005 18:04:43 -0000
Received: (qmail 23536 invoked by uid 500); 7 May 2005 18:07:33 -0000
Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org
Received: (qmail 23340 invoked by uid 500); 7 May 2005 18:07:32 -0000
Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:commons-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:commons-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:commons-dev-help@jakarta.apache.org>
List-Post: <mailto:commons-dev@jakarta.apache.org>
List-Id: "Jakarta Commons Developers List" <commons-dev.jakarta.apache.org>
Reply-To: "Jakarta Commons Developers List" <commons-dev@jakarta.apache.org>
Delivered-To: mailing list commons-dev@jakarta.apache.org
Received: (qmail 23325 invoked by uid 500); 7 May 2005 18:07:31 -0000
Received: (qmail 23321 invoked by uid 99); 7 May 2005 18:07:31 -0000
X-ASF-Spam-Status: No, hits=0.2 required=10.0
	tests=NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Sat, 07 May 2005 11:07:31 -0700
Received: (qmail 2934 invoked by uid 65534); 7 May 2005 18:04:33 -0000
Message-ID: <20050507180433.2933.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r169102 - in /jakarta/commons/proper/collections/trunk:
 RELEASE-NOTES.html
 src/java/org/apache/commons/collections/map/AbstractHashedMap.java
Date: Sat, 07 May 2005 18:04:33 -0000
To: commons-cvs@jakarta.apache.org
From: scolebourne@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: scolebourne
Date: Sat May  7 11:04:32 2005
New Revision: 169102

URL: http://svn.apache.org/viewcvs?rev=3D169102&view=3Drev
Log:
Calculate threshold before putting data in deserialization to avoid memory =
issue
bug 34265, reported by Marcos Cesar de Oliveira

Modified:
    jakarta/commons/proper/collections/trunk/RELEASE-NOTES.html
    jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/co=
llections/map/AbstractHashedMap.java

Modified: jakarta/commons/proper/collections/trunk/RELEASE-NOTES.html
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/collections/trunk=
/RELEASE-NOTES.html?rev=3D169102&r1=3D169101&r2=3D169102&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/commons/proper/collections/trunk/RELEASE-NOTES.html (original)
+++ jakarta/commons/proper/collections/trunk/RELEASE-NOTES.html Sat May  7 =
11:04:32 2005
@@ -64,6 +64,7 @@
 <li>AbstractLinkedMap.init() - Now calls createEntry() to create the map e=
ntry object [33706]</li>
 <li>BeanMap.initialize() - Internal variable now correctly initialised wit=
h only write methods that actually exist [15895]</li>
 <li>TransformedMap.putAll - Now allows putAll of an empty map [34686]</li>
+<li>AbstractHashedMap deserialization - Fix to prevent doubling of interna=
l data array [34265]</li>
 </ul>
=20
 <center><h3>JAVADOC</h3></center>

Modified: jakarta/commons/proper/collections/trunk/src/java/org/apache/comm=
ons/collections/map/AbstractHashedMap.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/collections/trunk=
/src/java/org/apache/commons/collections/map/AbstractHashedMap.java?rev=3D1=
69102&r1=3D169101&r2=3D169102&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/co=
llections/map/AbstractHashedMap.java (original)
+++ jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/co=
llections/map/AbstractHashedMap.java Sat May  7 11:04:32 2005
@@ -1204,13 +1204,13 @@
         int capacity =3D in.readInt();
         int size =3D in.readInt();
         init();
+        threshold =3D calculateThreshold(capacity, loadFactor);
         data =3D new HashEntry[capacity];
         for (int i =3D 0; i < size; i++) {
             Object key =3D in.readObject();
             Object value =3D in.readObject();
             put(key, value);
         }
-        threshold =3D calculateThreshold(data.length, loadFactor);
     }
    =20
     //--------------------------------------------------------------------=
---



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org