cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment EjbJarLoader.java

[jboynes]

jboynes     2003/11/17 18:14:19

  Modified:    modules/core/src/java/org/apache/geronimo/xml/deployment
                        EjbJarLoader.java
  Log:
  Need to look at query-method element, not parent
  Allow for empty arg sets
  
  Revision  Changes    Path
  1.11      +6 -3      
incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/EjbJarLoader.java
  
  Index: EjbJarLoader.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/EjbJarLoader.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- EjbJarLoader.java 17 Nov 2003 03:27:56 -0000      1.10
  +++ EjbJarLoader.java 18 Nov 2003 02:14:19 -0000      1.11
  @@ -317,7 +317,7 @@
           J2EELoader.loadDescribable(root, query);
           query.setEjbQl(LoaderUtil.getChildContent(root, "ejb-ql"));
           query.setResultTypeMapping(LoaderUtil.getChildContent(root, 
"result-type-mapping"));
  -        query.setQueryMethod(loadQueryMethod(root));
  +        query.setQueryMethod(loadQueryMethod(LoaderUtil.getChild(root, 
"query-method")));
           return query;
       }
   
  @@ -327,7 +327,10 @@
           }
           QueryMethod method = new QueryMethod();
           method.setMethodName(LoaderUtil.getChildContent(root, 
"method-name"));
  -        
method.setMethodParam(LoaderUtil.getChildrenContent(LoaderUtil.getChild(root, 
"method-params"), "method-param"));
  +        Element methodParams = LoaderUtil.getChild(root, "method-params");
  +        if (methodParams != null) {
  +            
method.setMethodParam(LoaderUtil.getChildrenContent(methodParams, 
"method-param"));
  +        }
           return method;
       }