svn commit: r501371 - in /webservices/sandesha/trunk/java/src/org/apache/sandesha2: storage/inmemory/InMemorySenderBeanMgr.java util/RMMsgCreator.java util/WSRMMessageSender.java

[mlovett]

Author: mlovett
Date: Tue Jan 30 03:23:08 2007
New Revision: 501371

URL: http://svn.apache.org/viewvc?view=rev&rev=501371
Log:
Clean up some redundant code

Modified:
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java?view=diff&rev=501371&r1=501370&r2=501371
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java
 (original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java
 Tue Jan 30 03:23:08 2007
@@ -29,7 +29,6 @@
 import org.apache.sandesha2.i18n.SandeshaMessageKeys;
 import org.apache.sandesha2.storage.SandeshaStorageException;
 import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
-import org.apache.sandesha2.storage.beans.RMBean;
 import org.apache.sandesha2.storage.beans.SenderBean;
 
 public class InMemorySenderBeanMgr extends InMemoryBeanMgr implements 
SenderBeanMgr {

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java?view=diff&rev=501371&r1=501370&r2=501371
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java 
(original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java 
Tue Jan 30 03:23:08 2007
@@ -257,23 +257,10 @@
                
                String rmNamespaceValue = 
SpecSpecificConstants.getRMNamespaceValue(rmsBean.getRMVersion());
 
-               if 
(!SpecSpecificConstants.isTerminateSequenceResponseRequired(rmsBean.getRMVersion()))
 {
-                       
terminateMessage.setProperty(MessageContext.TRANSPORT_IN, null);
-               }
-
                RMMsgContext terminateRMMessage = 
MsgInitializer.initializeMessage(terminateMessage);
 
                if (terminateMessage == null)
                        throw new 
SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.msgContextNotSet));
-
-               AxisOperation referenceMsgOperation = 
referenceMessage.getAxisOperation();
-               if (referenceMsgOperation != null) {
-                       ArrayList outPhases = 
referenceMsgOperation.getPhasesOutFlow();
-                       if (outPhases != null) {
-                               terminateOperation.setPhasesOutFlow(outPhases);
-                               
terminateOperation.setPhasesOutFaultFlow(outPhases);
-                       }
-               }
 
                TerminateSequence terminateSequencePart = new 
TerminateSequence(rmNamespaceValue);
                Identifier identifier = new Identifier(rmNamespaceValue);

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java?view=diff&rev=501371&r1=501370&r2=501371
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java
 (original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java
 Tue Jan 30 03:23:08 2007
@@ -30,8 +30,6 @@
 import org.apache.sandesha2.client.SandeshaClientConstants;
 import org.apache.sandesha2.i18n.SandeshaMessageHelper;
 import org.apache.sandesha2.i18n.SandeshaMessageKeys;
-import org.apache.sandesha2.security.SecurityManager;
-import org.apache.sandesha2.security.SecurityToken;
 import org.apache.sandesha2.storage.StorageManager;
 import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
 import org.apache.sandesha2.storage.beans.RMSBean;



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