From 089aaefeba28e15f27c16aca7542bc5cee773a33 Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Tue, 15 Nov 2005 17:08:45 +0000 Subject: [PATCH] ObjectStreamClass.java (findAccessibleMethod): Allow protected readResolve(). 2005-09-16 Andrew Haley * java/io/ObjectStreamClass.java (findAccessibleMethod): Allow protected readResolve(). Rewrite accessibility check. From-SVN: r107027 --- libjava/classpath/ChangeLog | 5 +++++ .../classpath/java/io/ObjectStreamClass.java | 17 +++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 6463f49c28d..e1868f26ea2 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,8 @@ +2005-09-16 Andrew Haley + + * java/io/ObjectStreamClass.java (findAccessibleMethod): Allow + protected readResolve(). Rewrite accessibility check. + 2005-09-06 Mark Wielaard * NEWS: Add new features for 0.18. diff --git a/libjava/classpath/java/io/ObjectStreamClass.java b/libjava/classpath/java/io/ObjectStreamClass.java index b7bd1271324..975dbfc66d0 100644 --- a/libjava/classpath/java/io/ObjectStreamClass.java +++ b/libjava/classpath/java/io/ObjectStreamClass.java @@ -514,14 +514,15 @@ outer: { Method res = c.getDeclaredMethod(name, noArgs); int mods = res.getModifiers(); - - if (c != from - && (Modifier.isPrivate(mods) - || ! Modifier.isPublic(mods) && ! inSamePackage(c, from))) - continue; - - AccessController.doPrivileged(new SetAccessibleAction(res)); - return res; + + if (c == from + || Modifier.isProtected(mods) + || Modifier.isPublic(mods) + || (! Modifier.isPrivate(mods) && inSamePackage(c, from))) + { + AccessController.doPrivileged(new SetAccessibleAction(res)); + return res; + } } catch (NoSuchMethodException e) { -- 2.30.2