axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmsn...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/ime/internal MessageExchangeProvider.java
Date Tue, 29 Oct 2002 22:42:24 GMT
jmsnell     2002/10/29 14:42:24

  Modified:    java/src/org/apache/axis/ime/internal
                        MessageExchangeProvider.java
  Log:
  Added an extra null pointer check
  
  Revision  Changes    Path
  1.7       +10 -7     xml-axis/java/src/org/apache/axis/ime/internal/MessageExchangeProvider.java
  
  Index: MessageExchangeProvider.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/ime/internal/MessageExchangeProvider.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- MessageExchangeProvider.java	29 Oct 2002 22:40:54 -0000	1.6
  +++ MessageExchangeProvider.java	29 Oct 2002 22:42:24 -0000	1.7
  @@ -199,9 +199,11 @@
               try {
                   while (!pool.isShuttingDown()) {
                       MessageExchangeSendContext context = (MessageExchangeSendContext)channel.select(SELECT_TIMEOUT);
  -                    if (handler != null)
  -                      handler.invoke(context.getMessageContext());
  -                    policy.dispatch(context);
  +                    if (context != null) {
  +                      if (handler != null)
  +                        handler.invoke(context.getMessageContext());
  +                      policy.dispatch(context);
  +                    }
                   }
               } catch (Throwable t) {
                   // kill the thread if any type of exception occurs.
  @@ -244,10 +246,11 @@
               try {
                   while (!pool.isShuttingDown()) {
                       MessageExchangeSendContext context = (MessageExchangeSendContext)channel.select(SELECT_TIMEOUT);
  -                    if (handler != null)
  -                      handler.invoke(context.getMessageContext());
  -                    if (context != null)
  -                        listener.onSend(context);
  +                    if (context != null) {
  +                      if (handler != null)
  +                        handler.invoke(context.getMessageContext());
  +                      listener.onSend(context);
  +                    }
                   }
               } catch (Throwable t) {
                   // kill the thread if any type of exception occurs.
  
  
  

Mime
View raw message