Author: chamikara
Date: Mon Jul  3 11:09:38 2006
New Revision: 418820

URL: http://svn.apache.org/viewvc?rev=418820&view=rev
Log:
Fixed a bug that could cause NullPointerExceptions in the 
TerminateSequenceProcessor

Modified:
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java?rev=418820&r1=418819&r2=418820&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
 (original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
 Mon Jul  3 11:09:38 2006
@@ -189,15 +189,15 @@
                                MessageContext highestInMsg = 
storageManager.retrieveMessageContext(highestImMsgKey,configCtx);
                                
                                //TODO get the out message in a storage 
friendly manner.
-                               MessageContext highestOutMessage = 
highestOutMessage = 
highestInMsg.getOperationContext().getMessageContext(OperationContextFactory.MESSAGE_LABEL_FAULT_VALUE);
+                               MessageContext highestOutMessage = 
highestInMsg.getOperationContext().getMessageContext(OperationContextFactory.MESSAGE_LABEL_FAULT_VALUE);
                                
                                if (highestOutMessage==null || 
highestOutMessage.getEnvelope()==null)
                                        highestOutMessage = 
highestInMsg.getOperationContext().getMessageContext(OperationContextFactory.MESSAGE_LABEL_OUT_VALUE);
                                
-                               if (highestOutMessage.getEnvelope()==null)
-                                       throw new SandeshaException ("Out 
message does not have a envelope");
-                               
                                if (highestOutMessage!=null) {
+                                       if 
(highestOutMessage.getEnvelope()==null)
+                                               throw new SandeshaException 
("Out message does not have a envelope");
+                                       
                                        RMMsgContext highestOutRMMsg = 
MsgInitializer.initializeMessage(highestOutMessage);
                                        Sequence seqPartOfOutMsg = (Sequence) 
highestOutRMMsg.getMessagePart(Sandesha2Constants.MessageParts.SEQUENCE);
                                



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to