Bug 338896 - isXPCOMJavaProxy throws NullPointerException. r=apeller.

Original committer: pedemont%us.ibm.com
Original revision: 1.5
Original date: 2006/05/30 16:18:10

extensions/java/xpcom/src/org/mozilla/xpcom/internal/XPCOMJavaProxy.java

@@ -187,7 +187,7 @@ public class XPCOMJavaProxy implements InvocationHandler {
    *          <code>false</code> otherwise
    */
   protected static boolean isXPCOMJavaProxy(Object aObject) {
-    if (Proxy.isProxyClass(aObject.getClass())) {
+    if (aObject != null && Proxy.isProxyClass(aObject.getClass())) {
       InvocationHandler h = Proxy.getInvocationHandler(aObject);
       if (h instanceof XPCOMJavaProxy) {
         return true;