[xstream-scm] [2248] trunk/xstream/src/java/com/thoughtworks/xstream/security/ CGLIBProxyTypePermission.java: Fix NPE in CGLIBProxyTypePermission.

[joehni]

Title: [2248] trunk/xstream/src/java/com/thoughtworks/xstream/security/CGLIBProxyTypePermission.java: Fix NPE in CGLIBProxyTypePermission.

Revision

2248

Author

joehni

Date

2014-01-31 12:04:28 -0600 (Fri, 31 Jan 2014)

Log Message

Fix NPE in CGLIBProxyTypePermission.

Modified Paths

• trunk/xstream/src/java/com/thoughtworks/xstream/security/CGLIBProxyTypePermission.java

Diff

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/security/CGLIBProxyTypePermission.java (2247 => 2248)

--- trunk/xstream/src/java/com/thoughtworks/xstream/security/CGLIBProxyTypePermission.java	2014-01-31 17:46:09 UTC (rev 2247)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/security/CGLIBProxyTypePermission.java	2014-01-31 18:04:28 UTC (rev 2248)
@@ -23,7 +23,7 @@
 
     @Override
     public boolean allows(final Class<?> type) {
-        return type != null
+        return type != null && type != Object.class && !type.isInterface()
             && (Proxy.isProxyClass(type) || type.getName().startsWith(Proxy.class.getPackage().getName() + "."));
     }
 

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email