You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by mc...@apache.org on 2007/11/12 14:23:41 UTC
svn commit: r594108 - in
/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2:
polling/PollingManager.java util/AcknowledgementManager.java
workers/SenderWorker.java
Author: mckierna
Date: Mon Nov 12 05:23:41 2007
New Revision: 594108
URL: http://svn.apache.org/viewvc?rev=594108&view=rev
Log:
performance refactor
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/polling/PollingManager.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/AcknowledgementManager.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/polling/PollingManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/polling/PollingManager.java?rev=594108&r1=594107&r2=594108&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/polling/PollingManager.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/polling/PollingManager.java Mon Nov 12 05:23:41 2007
@@ -224,8 +224,10 @@
// in the MakeConnection message.
wireAddress = replyTo.getAddress();
} else {
- wireSeqId = rmBean.getSequenceID();
+ wireSeqId = rmBean.getSequenceID(); //this case could make us non-RSP compliant
}
+
+ if(log.isDebugEnabled()) log.debug("Debug: PollingManager::pollForSequence, wireAddress=" + wireAddress + ", wireSeqId=" + wireSeqId);
MessageContext referenceMessage = storageManager.retrieveMessageContext(referenceMsgKey,context);
if(referenceMessage!=null){
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/AcknowledgementManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/AcknowledgementManager.java?rev=594108&r1=594107&r2=594108&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/AcknowledgementManager.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/AcknowledgementManager.java Mon Nov 12 05:23:41 2007
@@ -59,7 +59,7 @@
* @param applicationRMMsgContext
* @throws SandeshaException
*/
- public static Transaction piggybackAcksIfPresent(RMMsgContext rmMessageContext, StorageManager storageManager, Transaction transaction)
+ public static void piggybackAcksIfPresent(RMMsgContext rmMessageContext, StorageManager storageManager)
throws SandeshaException {
if (log.isDebugEnabled())
log.debug("Enter: AcknowledgementManager::piggybackAcksIfPresent");
@@ -103,14 +103,14 @@
}
}
if(log.isDebugEnabled()) log.debug("Exit: AcknowledgementManager::piggybackAcksIfPresent, anon");
- return transaction;
+ return;
}
else{
//an addressable EPR
if(SandeshaUtil.hasReferenceParameters(target)){
//we should not proceed since we cannot properly compare ref params
if(log.isDebugEnabled()) log.debug("Exit: AcknowledgementManager::piggybackAcksIfPresent, target has refParams");
- return transaction;
+ return;
}
// From here on, we must be dealing with a real address. Piggyback all sequences that have an
@@ -168,7 +168,7 @@
if (log.isDebugEnabled())
log.debug("Exit: AcknowledgementManager::piggybackAcksIfPresent");
- return transaction;
+ return;
}
/**
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=594108&r1=594107&r2=594108&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 Mon Nov 12 05:23:41 2007
@@ -227,8 +227,12 @@
transaction = storageManager.getTransaction();
// Piggyback ack messages based on the 'To' address of the message
- transaction = AcknowledgementManager.piggybackAcksIfPresent(rmMsgCtx, storageManager, transaction);
+ AcknowledgementManager.piggybackAcksIfPresent(rmMsgCtx, storageManager);
}
+ if (transaction != null && transaction.isActive())
+ transaction.commit();
+
+ transaction = storageManager.getTransaction();
if (transaction != null && transaction.isActive())
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org