axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/deployment/wsdd WSDDService.java
Date Tue, 17 Sep 2002 12:38:59 GMT
dims        2002/09/17 05:38:59

  Modified:    java/src/org/apache/axis/deployment/wsdd WSDDService.java
  Log:
  Fix for Bug 12698 - null pointer when running WSDDService.validateDescriptors()
  
  Revision  Changes    Path
  1.88      +3 -14     xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDService.java
  
  Index: WSDDService.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDService.java,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- WSDDService.java	9 Sep 2002 17:03:26 -0000	1.87
  +++ WSDDService.java	17 Sep 2002 12:38:59 -0000	1.88
  @@ -100,7 +100,7 @@
       extends WSDDTargetedChain
       implements WSDDTypeMappingContainer
   {
  -    private TypeMappingRegistry tmr = null;
  +    private TypeMappingRegistry tmr = new TypeMappingRegistryImpl();;
   
       private Vector faultFlows = new Vector();
       private Vector typeMappings = new Vector();
  @@ -186,6 +186,7 @@
               WSDDTypeMapping mapping =
                       new WSDDTypeMapping(typeMappingElements[i]);
               typeMappings.add(mapping);
  +            deployTypeMapping(mapping);
           }
   
           Element [] beanMappingElements = getChildElements(e, ELEM_WSDD_BEANMAPPING);
  @@ -193,6 +194,7 @@
               WSDDBeanMapping mapping =
                       new WSDDBeanMapping(beanMappingElements[i]);
               typeMappings.add(mapping);
  +            deployTypeMapping(mapping);
           }
   
           Element [] namespaceElements = getChildElements(e, ELEM_WSDD_NAMESPACE);
  @@ -231,8 +233,6 @@
   	    	_wsddHIchain = new WSDDJAXRPCHandlerInfoChain(hcEl);
           }
   
  -        initTMR();
  -
           // call to validate standard descriptors for this service
           validateDescriptors();
       }
  @@ -435,7 +435,6 @@
   
           AxisEngine.normaliseOptions(service);
   
  -        initTMR();
           tmr.delegate(registry.getTypeMappingRegistry());
   
           WSDDFaultFlow [] faultFlows = getFaultFlows();
  @@ -627,16 +626,6 @@
               registry.removeNamespaceMapping(namespace);
           }
           registry.removeNamespaceMapping(getQName().getLocalPart());
  -    }
  -
  -    public void initTMR() throws WSDDException
  -    {
  -        if (tmr == null) {
  -            tmr = new TypeMappingRegistryImpl();
  -            for (int i = 0; i < typeMappings.size(); i++) {
  -                deployTypeMapping((WSDDTypeMapping)typeMappings.get(i));
  -            }
  -        }
       }
   
       public TypeMapping getTypeMapping(String encodingStyle) {
  
  
  

Mime
View raw message