[openejb-scm] openejb/modules/openejb-builder/src/java/org/openejb/deployment OpenEJBReferenceBuilder.java

[djencks]

djencks     2005/08/25 01:20:41

  Modified:    modules/openejb-builder/src/java/org/openejb/deployment
                        OpenEJBReferenceBuilder.java
  Log:

  fix NPE
  
  Revision  Changes    Path
  1.2       +9 -5      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBReferenceBuilder.java
  
  Index: OpenEJBReferenceBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBReferenceBuilder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- OpenEJBReferenceBuilder.java      10 Aug 2005 02:24:56 -0000      1.1
  +++ OpenEJBReferenceBuilder.java      25 Aug 2005 05:20:41 -0000      1.2
  @@ -188,12 +188,16 @@
       private boolean matchesProxyInfo(GBeanData data, boolean isRemote, 
String home, String remote) {
           ProxyInfo proxyInfo = (ProxyInfo) data.getAttribute("proxyInfo");
           if (isRemote) {
  -            return proxyInfo.getHomeInterface().getName().equals(home)
  -                    && 
proxyInfo.getRemoteInterface().getName().equals(remote);
  +            return matches(proxyInfo.getHomeInterface(), home)
  +                    && matches(proxyInfo.getRemoteInterface(), remote);
           } else {
  -            return proxyInfo.getLocalHomeInterface().getName().equals(home)
  -                    && 
proxyInfo.getLocalInterface().getName().equals(remote);
  +            return matches(proxyInfo.getLocalHomeInterface(), home)
  +                    && matches(proxyInfo.getLocalInterface(), remote);
           }
  +    }
  +
  +    private boolean matches(Class clazz, String name) {
  +        return clazz != null && clazz.getName().equals(name);
       }
   
       public static final GBeanInfo GBEAN_INFO;