Author: mlovett
Date: Fri Jan 19 02:47:35 2007
New Revision: 497772
URL: http://svn.apache.org/viewvc?view=rev&rev=497772
Log:
Fix up a couple of merge errors
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java?view=diff&rev=497772&r1=497771&r2=497772
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
Fri Jan 19 02:47:35 2007
@@ -132,9 +132,6 @@
returnMessage.setProperty(Sandesha2Constants.MAKE_CONNECTION_RESPONSE,
Boolean.TRUE);
- // Store the response again
- storageManager.updateMessageContext(messageStorageKey,
returnMessage);
-
//running the MakeConnection through a SenderWorker.
//This will allow Sandesha2 to consider both of following
senarios equally.
// 1. A message being sent by the Sender thread.
@@ -143,8 +140,6 @@
worker.setMessage(returnRMMsg);
worker.run();
-
- senderBeanMgr.insert(senderBean);
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
