diff options
| author | Mark Wielaard <mark@gcc.gnu.org> | 2002-07-24 16:05:34 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@gcc.gnu.org> | 2002-07-24 16:05:34 +0000 |
| commit | 5526ddf6fd215e80083eea611180c6073f006da6 (patch) | |
| tree | b686e1771a3e2f1e0f071f8cae330a21d68da4e5 /libjava/java/io/ObjectInputStream.java | |
| parent | 5df533b352f83085011093326d32e1c9bc6a786d (diff) | |
| download | gcc-5526ddf6fd215e80083eea611180c6073f006da6.zip gcc-5526ddf6fd215e80083eea611180c6073f006da6.tar.gz gcc-5526ddf6fd215e80083eea611180c6073f006da6.tar.bz2 | |
[multiple changes]
2002-07-24 Mark Wielaard <mark@klomp.org>
* java/lang/reflect/natField.cc (setAddr): Check isAccessible().
* java/io/ObjectInputStream.java (setBooleanField): Before setting
field call setAccessible(true).
(setByteField): Likewise.
(setCharField): Likewise.
(setDoubleField): Likewise.
(setFloatField): Likewise.
(setIntField): Likewise.
(setLongField): Likewise.
(setShortField): Likewise.
(setObjectField): Likewise.
2002-07-24 Tom Tromey <tromey@redhat.com>
* java/io/ObjectInputStream.java (readObject) [TC_ARRAY]: Don't
use toString() to format array element.
From-SVN: r55711
Diffstat (limited to 'libjava/java/io/ObjectInputStream.java')
| -rw-r--r-- | libjava/java/io/ObjectInputStream.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libjava/java/io/ObjectInputStream.java b/libjava/java/io/ObjectInputStream.java index 140725a..e1e16f2 100644 --- a/libjava/java/io/ObjectInputStream.java +++ b/libjava/java/io/ObjectInputStream.java @@ -244,7 +244,7 @@ public class ObjectInputStream extends InputStream int handle = assignNewHandle (array); readArrayElements (array, componentType); for (int i=0, len=Array.getLength(array); i < len; i++) - dumpElementln (" ELEMENT[" + i + "]=" + Array.get(array, i).toString()); + dumpElementln (" ELEMENT[" + i + "]=" + Array.get(array, i)); ret_val = processResolution (array, handle); break; } @@ -1401,6 +1401,7 @@ public class ObjectInputStream extends InputStream { Class klass = obj.getClass (); Field f = getField (klass, field_name); + f.setAccessible(true); f.setBoolean (obj, val); } catch (Exception _) @@ -1415,6 +1416,7 @@ public class ObjectInputStream extends InputStream { Class klass = obj.getClass (); Field f = getField (klass, field_name); + f.setAccessible(true); f.setByte (obj, val); } catch (Exception _) @@ -1429,6 +1431,7 @@ public class ObjectInputStream extends InputStream { Class klass = obj.getClass (); Field f = getField (klass, field_name); + f.setAccessible(true); f.setChar (obj, val); } catch (Exception _) @@ -1443,6 +1446,7 @@ public class ObjectInputStream extends InputStream { Class klass = obj.getClass (); Field f = getField (klass, field_name); + f.setAccessible(true); f.setDouble (obj, val); } catch (Exception _) @@ -1457,6 +1461,7 @@ public class ObjectInputStream extends InputStream { Class klass = obj.getClass (); Field f = getField (klass, field_name); + f.setAccessible(true); f.setFloat (obj, val); } catch (Exception _) @@ -1471,6 +1476,7 @@ public class ObjectInputStream extends InputStream { Class klass = obj.getClass (); Field f = getField (klass, field_name); + f.setAccessible(true); f.setInt (obj, val); } catch (Exception _) @@ -1486,6 +1492,7 @@ public class ObjectInputStream extends InputStream { Class klass = obj.getClass (); Field f = getField (klass, field_name); + f.setAccessible(true); f.setLong (obj, val); } catch (Exception _) @@ -1501,6 +1508,7 @@ public class ObjectInputStream extends InputStream { Class klass = obj.getClass (); Field f = getField (klass, field_name); + f.setAccessible(true); f.setShort (obj, val); } catch (Exception _) @@ -1516,6 +1524,7 @@ public class ObjectInputStream extends InputStream { Class klass = obj.getClass (); Field f = getField (klass, field_name); + f.setAccessible(true); // FIXME: We should check the type_code here f.set (obj, val); } |