svn commit: r530299 - in /webservices/sandesha/trunk/java/src/org/apache/sandesha2: util/WSRMMessageSender.java workers/InvokerWorker.java

[mckierna]

Author: mckierna
Date: Thu Apr 19 00:39:07 2007
New Revision: 530299

URL: http://svn.apache.org/viewvc?view=rev&rev=530299
Log:
See http://issues.apache.org/jira/browse/SANDESHA2-85

Modified:
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/InvokerWorker.java

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java?view=diff&rev=530299&r1=530298&r2=530299
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java
 (original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java
 Thu Apr 19 00:39:07 2007
@@ -70,10 +70,11 @@
                internalSequenceID = 
                        
(String)rmMsgCtx.getProperty(Sandesha2Constants.MessageContextProperties.INTERNAL_SEQUENCE_ID);
                
+               toAddress = rmMsgCtx.getTo().getAddress();
+               sequenceKey = (String) 
options.getProperty(SandeshaClientConstants.SEQUENCE_KEY);
+               
                if(internalSequenceID==null)
                {
-                       toAddress = rmMsgCtx.getTo().getAddress();
-                       sequenceKey = (String) 
options.getProperty(SandeshaClientConstants.SEQUENCE_KEY);
                        internalSequenceID = 
SandeshaUtil.getInternalSequenceID(toAddress, sequenceKey);                     
   
                }
 

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/InvokerWorker.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/InvokerWorker.java?view=diff&rev=530299&r1=530298&r2=530299
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/InvokerWorker.java
 (original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/InvokerWorker.java
 Thu Apr 19 00:39:07 2007
@@ -96,17 +96,22 @@
                                        msgToInvoke.setPaused(false);
                                        engine.resumeReceive(msgToInvoke);
                                }
+                               
+                               if(transaction!=null){
+                                       transaction.commit();
+                                       transaction = 
storageManager.getTransaction();
+                               }
 
                        } catch (Exception e) {
                                if (log.isDebugEnabled())
                                        log.debug("Exception :", e);
-
+                               if(transaction!=null){
+                                       transaction.rollback();
+                                       transaction = 
storageManager.getTransaction();
+                               }
                                handleFault(msgToInvoke, e);
                        }
 
-
-
-                       
                        if (rmMsg.getMessageType() == 
Sandesha2Constants.MessageTypes.APPLICATION) {
                                Sequence sequence = (Sequence) rmMsg
                                                
.getMessagePart(Sandesha2Constants.MessageParts.SEQUENCE);
@@ -134,7 +139,6 @@
                                        return;
                                }
                        }
-                       
                        
                        if(!ignoreNextMsg){
                                // updating the next msg to invoke



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