Author: gatfora
Date: Fri Jun 6 10:02:16 2008
New Revision: 664035
URL: http://svn.apache.org/viewvc?rev=664035&view=rev
Log:
Applying patches from SANDESHA2-153, Thanks Sara
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SequenceManager.java
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?rev=664035&r1=664034&r2=664035&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
Fri Jun 6 10:02:16 2008
@@ -159,9 +159,7 @@
if (msgContext.getMessageID() == null)
msgContext.setMessageID(SandeshaUtil.getUUID());
- String storageKey = SandeshaUtil.getUUID(); // the key which
will be
-
// used to store this
-
// message.
+
/*
* Internal sequence id is the one used to refer to the
sequence (since
@@ -440,8 +438,9 @@
throw new SandeshaException(message);
}
- String messageId1 = SandeshaUtil.getUUID();
+
if (rmMsgCtx.getMessageId() == null) {
+ String messageId1 = SandeshaUtil.getUUID();
rmMsgCtx.setMessageId(messageId1);
}
@@ -461,9 +460,10 @@
}
// processing the response if not an dummy.
- if (!dummyMessage)
+ if (!dummyMessage){
+ String storageKey = SandeshaUtil.getUUID();
processResponseMessage(rmMsgCtx, rmsBean,
internalSequenceId, outSequenceID, messageNumber, storageKey, storageManager,
tran, hasUserTransaction);
-
+ }
//Users wont be able to get reliable response msgs in
the back channel in the back channel of a
//reliable message. If he doesn't have a endpoint he
should use polling mechanisms.
msgContext.pause();
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java?rev=664035&r1=664034&r2=664035&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
Fri Jun 6 10:02:16 2008
@@ -170,7 +170,7 @@
}
EndpointReference replyTo = rmMsgCtx.getReplyTo();
- String key = SandeshaUtil.getUUID(); // key to store the
message.
+
// updating the Highest_In_Msg_No property which gives the
highest
// message number retrieved from this sequence.
long highestInMsgNo = bean.getHighestInMessageNumber();
@@ -371,7 +371,7 @@
// it directly ourselves.
InvokerWorker worker = null;
if (SandeshaUtil.isInOrder(msgCtx)) {
-
+ String key = SandeshaUtil.getUUID(); // key to store
the message.
InvokerBean invokerBean = new InvokerBean(key, msgNo,
sequenceId);
ContextManager contextMgr =
SandeshaUtil.getContextManager(configCtx);
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SequenceManager.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SequenceManager.java?rev=664035&r1=664034&r2=664035&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SequenceManager.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SequenceManager.java
Fri Jun 6 10:02:16 2008
@@ -65,8 +65,7 @@
if (log.isDebugEnabled())
log.debug("Enter: SequenceManager::setupNewSequence");
- String sequenceId = SandeshaUtil.getUUID();
-
+
// Generate the new RMD Bean
RMDBean rmdBean = new RMDBean();
@@ -119,7 +118,7 @@
rmdBean.setSecurityTokenData(tokenData);
}
- rmdBean.setSequenceID(sequenceId);
+ rmdBean.setSequenceID(SandeshaUtil.getUUID());
rmdBean.setNextMsgNoToProcess(1);
rmdBean.setToAddress(to.getAddress());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
