axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: ws-axis/java/src/org/apache/axis/utils XMLUtils.java
Date Tue, 01 Mar 2005 00:13:36 GMT
dims        2005/02/28 16:13:36

  Modified:    java/src/org/apache/axis/message SOAPHeader.java
               java/src/org/apache/axis/encoding TypeMappingImpl.java
               java/src/org/apache/axis/utils XMLUtils.java
  Log:
  Add extra null checks (some folks don't use AxisEngine :)
  
  Revision  Changes    Path
  1.85      +2 -2      ws-axis/java/src/org/apache/axis/message/SOAPHeader.java
  
  Index: SOAPHeader.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/message/SOAPHeader.java,v
  retrieving revision 1.84
  retrieving revision 1.85
  diff -u -r1.84 -r1.85
  --- SOAPHeader.java	29 Jun 2004 13:32:28 -0000	1.84
  +++ SOAPHeader.java	1 Mar 2005 00:13:36 -0000	1.85
  @@ -286,9 +286,9 @@
                       if (firstTime) {
                           // Do one-time setup
                           MessageContext mc = MessageContext.getCurrentContext();
  -                        if (mc != null)
  +                        if (mc != null &&  mc.getAxisEngine() != null) {
                               actors = mc.getAxisEngine().getActorURIs();
  -                            
  +                        }
                           firstTime = false;
                       }
   
  
  
  
  1.59      +2 -2      ws-axis/java/src/org/apache/axis/encoding/TypeMappingImpl.java
  
  Index: TypeMappingImpl.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/encoding/TypeMappingImpl.java,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- TypeMappingImpl.java	26 Feb 2005 21:37:33 -0000	1.58
  +++ TypeMappingImpl.java	1 Mar 2005 00:13:36 -0000	1.59
  @@ -701,10 +701,10 @@
           MessageContext msgContext = MessageContext.getCurrentContext();
           if(msgContext != null) {
               if (msgContext.isPropertyTrue("axis.doAutoTypes") ||
  -                    JavaUtils.isTrue(msgContext.getAxisEngine().getOption("axis.doAutoTypes")))
{
  +                    (msgContext.getAxisEngine() != null && JavaUtils.isTrue(msgContext.getAxisEngine().getOption("axis.doAutoTypes"))))
{
                   doAutoTypes = Boolean.TRUE;
               }
  -        } 
  +        }
           if(doAutoTypes == null){
               doAutoTypes = AxisProperties.getProperty("axis.doAutoTypes",
                       "false")
  
  
  
  1.103     +1 -1      ws-axis/java/src/org/apache/axis/utils/XMLUtils.java
  
  Index: XMLUtils.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/utils/XMLUtils.java,v
  retrieving revision 1.102
  retrieving revision 1.103
  diff -u -r1.102 -r1.103
  --- XMLUtils.java	10 Feb 2005 15:36:07 -0000	1.102
  +++ XMLUtils.java	1 Mar 2005 00:13:36 -0000	1.103
  @@ -957,7 +957,7 @@
           if(msgContext != null && encoding == null){
               encoding = (String) msgContext.getProperty(SOAPMessage.CHARACTER_SET_ENCODING);
           }
  -        if (msgContext != null && encoding == null) {
  +        if (msgContext != null && encoding == null && msgContext.getAxisEngine()
!= null) {
               encoding = (String) msgContext.getAxisEngine().getOption(AxisEngine.PROP_XML_ENCODING);
           }
           if (encoding == null && defaultEncoder != null) {
  
  
  

Mime
View raw message