svn commit: r495594 - in /webservices/sandesha/trunk/java/src/org/apache/sandesha2: client/SandeshaClient.java util/MessageRetransmissionAdjuster.java

[gatfora]

Author: gatfora
Date: Fri Jan 12 07:01:29 2007
New Revision: 495594

URL: http://svn.apache.org/viewvc?view=rev&rev=495594
Log:
Sender transaction committed when Sequence times out

Modified:
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java?view=diff&rev=495594&r1=495593&r2=495594
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
 (original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
 Fri Jan 12 07:01:29 2007
@@ -101,8 +101,13 @@
                return getOutgoingSequenceReport(internalSequenceID, 
configurationContext);
        }
 
-       public static SequenceReport getOutgoingSequenceReport(String 
internalSequenceID,
+       public static SequenceReport getOutgoingSequenceReport(String 
internalSequenceID,       
                        ConfigurationContext configurationContext) throws 
SandeshaException {
+         return getOutgoingSequenceReport(internalSequenceID, 
configurationContext, true);
+       }
+       
+       public static SequenceReport getOutgoingSequenceReport(String 
internalSequenceID,
+                       ConfigurationContext configurationContext, boolean 
createTransaction) throws SandeshaException {
 
                SequenceReport sequenceReport = new SequenceReport();
                
sequenceReport.setSequenceDirection(SequenceReport.SEQUENCE_DIRECTION_OUT);
@@ -114,7 +119,8 @@
                Transaction reportTransaction = null;
 
                try {
-                       reportTransaction = storageManager.getTransaction();
+                       if (createTransaction)
+                               reportTransaction = 
storageManager.getTransaction();
 
                        
sequenceReport.setInternalSequenceID(internalSequenceID);
 

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java?view=diff&rev=495594&r1=495593&r2=495594
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java
 (original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java
 Fri Jan 12 07:01:29 2007
@@ -140,7 +140,8 @@
                        StorageManager storageManager) throws SandeshaException 
{
                ConfigurationContext configurationContext = 
messageContext.getConfigurationContext();
 
-               SequenceReport report = 
SandeshaClient.getOutgoingSequenceReport(internalSequenceID, 
configurationContext);
+               // Already an active transaction, so don't want a new one
+               SequenceReport report = 
SandeshaClient.getOutgoingSequenceReport(internalSequenceID, 
configurationContext, false);
                
TerminateManager.timeOutSendingSideSequence(configurationContext,sequencePropertyKey
 ,internalSequenceID, false, storageManager);
 
                SandeshaListener listener = (SandeshaListener) messageContext



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