From e7c95c03af7553d2f95f04773f6ba10f48507e52 Mon Sep 17 00:00:00 2001 From: serb Date: Sat, 23 May 2015 02:49:50 +0300 Subject: [PATCH] 8080541: More direct property handling Reviewed-by: prr, alexsch --- src/share/classes/java/beans/PropertyDescriptor.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/share/classes/java/beans/PropertyDescriptor.java b/src/share/classes/java/beans/PropertyDescriptor.java index 07149f975..687fff577 100644 --- a/src/share/classes/java/beans/PropertyDescriptor.java +++ b/src/share/classes/java/beans/PropertyDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,6 +28,7 @@ package java.beans; import java.lang.ref.Reference; import java.lang.reflect.Method; import java.lang.reflect.Constructor; +import sun.reflect.misc.ReflectUtil; /** * A PropertyDescriptor describes one property that a Java Bean @@ -426,8 +427,9 @@ public class PropertyDescriptor extends FeatureDescriptor { public PropertyEditor createPropertyEditor(Object bean) { Object editor = null; - Class cls = getPropertyEditorClass(); - if (cls != null) { + final Class cls = getPropertyEditorClass(); + if (cls != null && PropertyEditor.class.isAssignableFrom(cls) + && ReflectUtil.isPackageAccessible(cls)) { Constructor ctor = null; if (bean != null) { try { -- GitLab