Author: gatfora
Date: Thu May 22 22:57:58 2008
New Revision: 659437
URL: http://svn.apache.org/viewvc?rev=659437&view=rev
Log:
Applying patch for SANDESHA2-151, thanks Dave
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java?rev=659437&r1=659436&r2=659437&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
Thu May 22 22:57:58 2008
@@ -43,6 +43,7 @@
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
import org.apache.sandesha2.security.SecurityManager;
import org.apache.sandesha2.security.SecurityToken;
+import org.apache.sandesha2.storage.SandeshaStorageException;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.Transaction;
import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
@@ -297,7 +298,25 @@
SandeshaUtil.getStackTraceFromException(e)),
e,
rmdBean.getAcksToEndpointReference());
- // Return false if an Exception hasn't been
thrown.
+
+ //Tidy up the RMDBean
+ Transaction tran = null;
+ try {
+ tran = storageManager.getTransaction();
+
storageManager.getRMDBeanMgr().delete(rmdBean.getSequenceID());
+
+ if(tran != null && tran.isActive())
tran.commit();
+ tran = null;
+
+ } catch (SandeshaStorageException ex){
+ if (log.isDebugEnabled())
+ log.debug("Caught an exception
deleting the RMD bean", ex);
+ } finally {
+ if(tran!=null && tran.isActive())
+ tran.rollback();
+ }
+
+ // Return false if an Exception hasn't been
thrown.
if (log.isDebugEnabled())
log.debug("Exit:
CreateSeqMsgProcessor::processInMessage " + Boolean.FALSE);
return false;
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java?rev=659437&r1=659436&r2=659437&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
Thu May 22 22:57:58 2008
@@ -638,6 +638,9 @@
responseMessageContext.setServiceContext(msgCtx.getServiceContext());
}
else{
+ //Setting the AxisService object
+
responseMessageContext.setAxisService(msgCtx.getAxisService());
+
//we cannot set service ctx for
application response msgs since the srvc ctx will not match the op ctx, causing
//problems with addressing
if(log.isDebugEnabled()) log.debug("NOT
setting service ctx for response type " + messageType + ", current srvc ctx ="
+ responseMessageContext.getServiceContext());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
