[openejb-scm] openejb1/modules/core/src/java/org/openejb/alt/assembler/classic EnterpriseBeanBuilder.java

[dblevins]

dblevins    2005/08/23 00:22:57

  Modified:    modules/core/src/java/org/openejb/alt/assembler/classic
                        EnterpriseBeanBuilder.java
  Log:

  Missed some code when I implemented ejb Local interface support a while back.
  
  Revision  Changes    Path
  1.4       +15 -10    
openejb1/modules/core/src/java/org/openejb/alt/assembler/classic/EnterpriseBeanBuilder.java
  
  Index: EnterpriseBeanBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/alt/assembler/classic/EnterpriseBeanBuilder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EnterpriseBeanBuilder.java        16 Aug 2005 02:03:54 -0000      1.3
  +++ EnterpriseBeanBuilder.java        23 Aug 2005 04:22:57 -0000      1.4
  @@ -149,15 +149,20 @@
               
deployment.setIsReentrant(entity.reentrant.equalsIgnoreCase("true"));
   
               if (ejbType == EjbType.CMP_ENTITY) {
  -                QueryInfo[] queries = entity.queries;
  -                if (queries != null) {
  -                    for (int i = 0; i < queries.length; i++) {
  -                        Vector finderMethods = new Vector();
  -                        QueryInfo query = queries[i];
  +                QueryInfo[] queries = (entity.queries == null)? new 
QueryInfo[]{}:entity.queries;
  +                for (int i = 0; i < queries.length; i++) {
  +                    QueryInfo query = queries[i];
  +
  +                    Vector finderMethods = new Vector();
  +
  +                    if (home != null ){
                           AssemblerTool.resolveMethods(finderMethods, home, 
query.method);
  -                        for (int j = 0; j < finderMethods.size(); j++) {
  -                            deployment.addQuery((Method) 
finderMethods.elementAt(j), query.queryStatement);
  -                        }
  +                    }
  +                    if (localhome != null ){
  +                        AssemblerTool.resolveMethods(finderMethods, 
localhome, query.method);
  +                    }
  +                    for (int j = 0; j < finderMethods.size(); j++) {
  +                        deployment.addQuery((Method) 
finderMethods.elementAt(j), query.queryStatement);
                       }
                   }
                   deployment.setCmrFields(entity.cmpFieldNames);