infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-27 18:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

8012071: Better Building of Beans

Browse Source 
Reviewed-by: art, skoivu
This commit is contained in:
Sergey Malenkov 2013-05-20 19:49:20 +04:00
parent 9a9e180fdd
commit 5c6c0246cc
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/share/classes/java/beans/Beans.java
View File

@ -42,6 +42,8 @@ import java.io.ObjectInputStream;
import java.io.ObjectStreamClass;
import java.io.StreamCorruptedException;
import java.lang.reflect.Modifier;
import java.net.URL;
import java.security.AccessController;
@ -222,6 +224,10 @@ public class Beans {
throw ex;
}
if (!Modifier.isPublic(cl.getModifiers())) {
throw new ClassNotFoundException("" + cl + " : no public access");
}
/*
* Try to instantiate the class.
*/

3
jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java
View File

@ -221,6 +221,9 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate {
// Write out the properties of this instance.
private void initBean(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
for (Field field : type.getFields()) {
if (!ReflectUtil.isPackageAccessible(field.getDeclaringClass())) {
continue;
}
int mod = field.getModifiers();
if (Modifier.isFinal(mod) || Modifier.isStatic(mod) || Modifier.isTransient(mod)) {
continue;

19
jdk/src/share/classes/java/beans/MetaData.java
View File

@ -42,6 +42,7 @@ import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.InvocationTargetException;
import java.security.AccessController;
@ -56,7 +57,7 @@ import javax.swing.plaf.ColorUIResource;
import sun.swing.PrintColorUIResource;
import java.util.Objects;
import static sun.reflect.misc.ReflectUtil.isPackageAccessible;
/*
* Like the <code>Intropector</code>, the <code>MetaData</code> class
@ -850,13 +851,15 @@ static final class java_awt_AWTKeyStroke_PersistenceDelegate extends Persistence
static class StaticFieldsPersistenceDelegate extends PersistenceDelegate {
protected void installFields(Encoder out, Class<?> cls) {
Field fields[] = cls.getFields();
for(int i = 0; i < fields.length; i++) {
Field field = fields[i];
// Don't install primitives, their identity will not be preserved
// by wrapping.
if (Object.class.isAssignableFrom(field.getType())) {
out.writeExpression(new Expression(field, "get", new Object[]{null}));
if (Modifier.isPublic(cls.getModifiers()) && isPackageAccessible(cls)) {
Field fields[] = cls.getFields();
for(int i = 0; i < fields.length; i++) {
Field field = fields[i];
// Don't install primitives, their identity will not be preserved
// by wrapping.
if (Object.class.isAssignableFrom(field.getType())) {
out.writeExpression(new Expression(field, "get", new Object[]{null}));
}
}
}
}