cvs commit: xml-axis/java/src/org/apache/axis/deployment/wsdd WSDDDeployment.java

[gdaniels]

gdaniels    02/03/01 09:17:05

  Modified:    java/src/org/apache/axis/deployment/wsdd WSDDDeployment.java
  Log:
  Check for null encodingStyle (changing it to SOAP-ENC for now by
  default) before looking anything up.
  
  Revision  Changes    Path
  1.28      +7 -7      
xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployment.java
  
  Index: WSDDDeployment.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployment.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- WSDDDeployment.java       22 Feb 2002 23:39:44 -0000      1.27
  +++ WSDDDeployment.java       1 Mar 2002 17:17:05 -0000       1.28
  @@ -292,16 +292,16 @@
               throws WSDDException
       {
           try {
  -            TypeMapping tm = (TypeMapping) 
tmr.getTypeMapping(mapping.getEncodingStyle());
  +            String encodingStyle = mapping.getEncodingStyle();
  +            if (encodingStyle == null) {
  +                encodingStyle = Constants.URI_CURRENT_SOAP_ENC;
  +            }
  +            TypeMapping tm = (TypeMapping) tmr.getTypeMapping(encodingStyle);
               TypeMapping df = (TypeMapping) tmr.getDefaultTypeMapping();
               if (tm == null || tm == df) {
                   tm = (TypeMapping) tmr.createTypeMapping();
  -                String namespace = mapping.getEncodingStyle();
  -                if (mapping.getEncodingStyle() == null) {
  -                    namespace = Constants.URI_CURRENT_SOAP_ENC;
  -                }
  -                tm.setSupportedNamespaces(new String[] {namespace});
  -                tmr.register(namespace, tm);
  +                tm.setSupportedNamespaces(new String[] {encodingStyle});
  +                tmr.register(encodingStyle, tm);
               }
   
               SerializerFactory   ser   = null;