[jBoss-Dev] CVS update: jboss/src/main/org/jboss/metadataMetaData.java BeanMetaData.java

[jBoss CVS Development]

  User: juha    
  Date: 00/08/26 13:10:41

  Modified:    src/main/org/jboss/metadata MetaData.java BeanMetaData.java
  Log:
  Fixes an NPE bug on resource-refs on jboss.xml when a match
  was not found in ejb-jar.xml.
  
  Revision  Changes    Path
  1.8       +5 -1      jboss/src/main/org/jboss/metadata/MetaData.java
  
  Index: MetaData.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/metadata/MetaData.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- MetaData.java     2000/08/17 17:37:55     1.7
  +++ MetaData.java     2000/08/26 20:10:41     1.8
  @@ -22,7 +22,7 @@
    *      
    *   @see <related>
    *   @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
  - *   @version $Revision: 1.7 $
  + *   @version $Revision: 1.8 $
    */
   public abstract class MetaData implements XmlLoadable {
       // Constants -----------------------------------------------------
  @@ -38,6 +38,8 @@
       
       // Static --------------------------------------------------------
       public static Iterator getChildrenByTagName(Element element, String tagName) {
  +             if (element == null) return null;
  +
                // getElementsByTagName gives the corresponding elements in the whole 
descendance.
            // We want only children
                
  @@ -55,6 +57,7 @@
        
        
        public static Element getUniqueChild(Element element, String tagName) throws 
DeploymentException {
  +
                Iterator goodChildren = getChildrenByTagName(element, tagName);
                
                if (goodChildren.hasNext()) {
  @@ -70,6 +73,7 @@
        
        
        public static Element getOptionalChild(Element element, String tagName) throws 
DeploymentException {
  +
                Iterator goodChildren = getChildrenByTagName(element, tagName);
   
                if (goodChildren.hasNext()) {
  
  
  
  1.8       +6 -1      jboss/src/main/org/jboss/metadata/BeanMetaData.java
  
  Index: BeanMetaData.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/metadata/BeanMetaData.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- BeanMetaData.java 2000/08/25 20:19:18     1.7
  +++ BeanMetaData.java 2000/08/26 20:10:41     1.8
  @@ -21,7 +21,7 @@
    *      
    *   @see <related>
    *   @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
  - *   @version $Revision: 1.7 $
  + *   @version $Revision: 1.8 $
    */
   public abstract class BeanMetaData extends MetaData {
       // Constants -----------------------------------------------------
  @@ -216,6 +216,11 @@
                        String resRefName = 
getElementContent(getUniqueChild(resourceRef, "res-ref-name"));
                        String resourceName = 
getElementContent(getUniqueChild(resourceRef, "resource-name"));
                        ResourceRefMetaData resourceRefMetaData = 
(ResourceRefMetaData)resourceReferences.get(resRefName);
  +            
  +            if (resourceRefMetaData == null) {
  +                throw new DeploymentException("resource-ref " + resRefName + " 
found in jboss.xml but not in ejb-jar.xml");
  +            }
  +            
                    resourceRefMetaData.setResourceName(resourceName);
                }