[openejb-scm] openejb/modules/core/src/java/org/openejb/client EntityEJBHomeHandler.java

[gdamour]

gdamour     2005/02/21 03:55:22

  Modified:    modules/core/src/java/org/openejb/client
                        EntityEJBHomeHandler.java
  Log:

  GERONIMO-591.
  
  Finder can return null if the selected value is a cmr path. Filter out the 
null values accordingly.
  
  Revision  Changes    Path
  1.5       +10 -1     
openejb/modules/core/src/java/org/openejb/client/EntityEJBHomeHandler.java
  
  Index: EntityEJBHomeHandler.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/client/EntityEJBHomeHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- EntityEJBHomeHandler.java 11 Feb 2005 06:44:39 -0000      1.4
  +++ EntityEJBHomeHandler.java 21 Feb 2005 08:55:13 -0000      1.5
  @@ -142,6 +142,9 @@
           
           case EJB_OK_FOUND:
               primKey = res.getResult();
  +            if (null == primKey) {
  +                return null;
  +            }
               handler = 
EJBObjectHandler.createEJBObjectHandler(ejb,server,primKey);
               handler.setEJBHomeProxy((EJBHomeProxy)proxy);
               registerHandler(ejb.deploymentID+":"+primKey, handler);
  @@ -156,6 +159,9 @@
   
               for (int i=0; i < primaryKeys.length; i++){
                   primKey = primaryKeys[i];
  +                if (null == primKey) {
  +                    continue;
  +                }
                   handler = 
EJBObjectHandler.createEJBObjectHandler(ejb,server,primKey);
                   handler.setEJBHomeProxy((EJBHomeProxy)proxy);
                   registerHandler(ejb.deploymentID+":"+primKey, handler);
  @@ -168,6 +174,9 @@
   
               for (int i=0; i < primaryKeys.length; i++){
                   primKey = primaryKeys[i];
  +                if (null == primKey) {
  +                    continue;
  +                }
                   handler = 
EJBObjectHandler.createEJBObjectHandler(ejb,server,primKey);
                   handler.setEJBHomeProxy((EJBHomeProxy)proxy);
                   registerHandler(ejb.deploymentID+":"+primKey, handler);