[jboss-cvs] JBossAS SVN: r102252 - projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/impl/handler/session.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2010-03-10 19:06:51 -0500 (Wed, 10 Mar 2010)
New Revision: 102252

Modified:
   projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/impl/handler/session/SessionProxyInvocationHandlerBase.java
Log:
[EJBTHREE-2039] Fix proxy.equals(null) to return false, not NPE

Modified: projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/impl/handler/session/SessionProxyInvocationHandlerBase.java
===================================================================
--- projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/impl/handler/session/SessionProxyInvocationHandlerBase.java	2010-03-11 00:04:45 UTC (rev 102251)
+++ projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/impl/handler/session/SessionProxyInvocationHandlerBase.java	2010-03-11 00:06:51 UTC (rev 102252)
@@ -275,7 +275,7 @@
     * @param args
     * @return
     */
-   protected boolean invokeEquals(Object proxy, Object argument)
+   protected boolean invokeEquals(final Object proxy, final Object argument)
    {
       /*
        * EJB 3.0 Core Specification 3.4.5.1: 
@@ -304,11 +304,18 @@
        * Session bean references to either different business interface types
        * or different session beans will not be equal."
        */
+      
+      // Short-circuit if we're given null
+      // EJBTHREE-2039
+      if (argument == null)
+      {
+         return false;
+      }
 
       // Ensure we've got j.l.r.Proxies
       assert Proxy.isProxyClass(proxy.getClass()) && Proxy.isProxyClass(argument.getClass()) : "invokeEquals handles only "
             + Proxy.class.getName();
-
+      
       // Get the InvocationHandlers
       InvocationHandler proxyHandler = Proxy.getInvocationHandler(proxy);
       InvocationHandler argumentHandler = Proxy.getInvocationHandler(argument);