You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2005/02/04 20:10:53 UTC

cvs commit: ws-axis/java/src/org/apache/axis/handlers HandlerChainImpl.java

dims        2005/02/04 11:10:53

  Modified:    java/src/org/apache/axis/handlers HandlerChainImpl.java
  Log:
  Prevent NPE's.
  
  Revision  Changes    Path
  1.17      +8 -3      ws-axis/java/src/org/apache/axis/handlers/HandlerChainImpl.java
  
  Index: HandlerChainImpl.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/handlers/HandlerChainImpl.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- HandlerChainImpl.java	4 Feb 2005 18:11:24 -0000	1.16
  +++ HandlerChainImpl.java	4 Feb 2005 19:10:53 -0000	1.17
  @@ -81,7 +81,7 @@
       public void addNewHandler(String className, Map config) {
           try {
               HandlerInfo handlerInfo =
  -            new HandlerInfo(ClassUtils.forName(className), config, null);
  +                new HandlerInfo(ClassUtils.forName(className), config, null);
               handlerInfos.add(handlerInfo);
               add(newHandler(handlerInfo));
           } catch (Exception ex) {
  @@ -113,6 +113,8 @@
       public ArrayList getMessageInfo(SOAPMessage message) {
           ArrayList list = new ArrayList();
           try {
  +            if(message == null || message.getSOAPPart() == null)
  +                return list;
               SOAPEnvelope env = message.getSOAPPart().getEnvelope();
               SOAPBody body = env.getBody();
               Iterator it = body.getChildElements();
  @@ -176,7 +178,8 @@
           try {
               SOAPMessage message = msgContext.getMessage();
               // Ensure that message is already in the form we want 
  -            message.getSOAPPart().getEnvelope();
  +            if(message != null && message.getSOAPPart() != null)
  +                message.getSOAPPart().getEnvelope();
               msgContext.setProperty(org.apache.axis.SOAPPart.ALLOW_FORM_OPTIMIZATION,
                       Boolean.FALSE);
               msgContext.setProperty(JAXRPC_METHOD_INFO, getMessageInfo(message));
  @@ -199,7 +202,9 @@
               }
           }
           try {
  -            msgContext.getMessage().saveChanges();
  +            if (message != null) {
  +                message.saveChanges();
  +            }
           } catch (SOAPException e) {
               log.debug("Exception in postInvoke : ", e);
               throw new RuntimeException("Exception in postInvoke : ", e);