aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorStepan Koltsov <yozh@mx1.ru>2003-08-01 03:32:42 +0000
committerTom Tromey <tromey@gcc.gnu.org>2003-08-01 03:32:42 +0000
commite14c33e5afb8977784f2fbf1c896e130c14282fb (patch)
tree2f4e5b60f027e86bbf53588d58d1f699817dd966 /libjava
parent5bea01beb9fe2120aa6d121dce29fe50dd9d3578 (diff)
downloadgcc-e14c33e5afb8977784f2fbf1c896e130c14282fb.zip
gcc-e14c33e5afb8977784f2fbf1c896e130c14282fb.tar.gz
gcc-e14c33e5afb8977784f2fbf1c896e130c14282fb.tar.bz2
re PR libgcj/11728 (HashMap serialization does not work)
2003-07-31 Stepan Koltsov <yozh@mx1.ru> Fix for PR libgcj/11728: From-SVN: r70037
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/util/HashMap.java3
2 files changed, 7 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 573b983..e834b73 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-31 Stepan Koltsov <yozh@mx1.ru>
+
+ Fix for PR libgcj/11728:
+ * java/util/HashMap.java (readObject): Set size.
+
2003-07-31 Tom Tromey <tromey@redhat.com>
Fix for PR libgcj/11737:
diff --git a/libjava/java/util/HashMap.java b/libjava/java/util/HashMap.java
index 9faca03..6b3466c 100644
--- a/libjava/java/util/HashMap.java
+++ b/libjava/java/util/HashMap.java
@@ -1,6 +1,6 @@
/* HashMap.java -- a class providing a basic hashtable data structure,
mapping Object --> Object
- Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -808,6 +808,7 @@ public class HashMap extends AbstractMap
// Read and use capacity, followed by key/value pairs.
buckets = new HashEntry[s.readInt()];
int len = s.readInt();
+ size = len;
while (len-- > 0)
{
Object key = s.readObject();