Author: mlovett
Date: Tue Nov 14 03:12:47 2006
New Revision: 474731
URL: http://svn.apache.org/viewvc?view=rev&rev=474731
Log:
Minor trace and import updates taken from the patch to SANDESHA2-42
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java?view=diff&rev=474731&r1=474730&r2=474731
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java
Tue Nov 14 03:12:47 2006
@@ -39,7 +39,6 @@
import org.apache.sandesha2.storage.beans.CreateSeqBean;
import org.apache.sandesha2.storage.beans.NextMsgBean;
import org.apache.sandesha2.storage.beans.SenderBean;
-import org.apache.sandesha2.transport.Sandesha2TransportOutDesc;
import org.apache.sandesha2.util.MsgInitializer;
import org.apache.sandesha2.util.RMMsgCreator;
import org.apache.sandesha2.util.SandeshaUtil;
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=474731&r1=474730&r2=474731
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
Tue Nov 14 03:12:47 2006
@@ -490,6 +490,8 @@
*/
public static void addAckMessage(RMMsgContext applicationMsg, String
sequencePropertyKey ,String sequenceId, StorageManager storageManager)
throws AxisFault {
+ if(log.isDebugEnabled())
+ log.debug("Entry: RMMsgCreator::addAckMessage " +
sequenceId);
SOAPFactory factory = null;
SOAPEnvelope envelope = applicationMsg.getSOAPEnvelope();
@@ -550,6 +552,9 @@
// Ensure the message also contains the token that needs to be
used
secureOutboundMessage(sequencePropertyKey,
applicationMsg.getMessageContext());
+
+ if(log.isDebugEnabled())
+ log.debug("Exit: RMMsgCreator::addAckMessage");
}
public static RMMsgContext createMakeConnectionMessage (RMMsgContext
referenceRMMessage, String makeConnectionSeqId,
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java?view=diff&rev=474731&r1=474730&r2=474731
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
Tue Nov 14 03:12:47 2006
@@ -27,8 +27,6 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.MessageContextConstants;
-import org.apache.axis2.description.TransportOutDescription;
-import org.apache.axis2.engine.AxisEngine;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.RMMsgContext;
@@ -47,7 +45,6 @@
import org.apache.sandesha2.storage.beans.NextMsgBean;
import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
-import org.apache.sandesha2.transport.Sandesha2TransportOutDesc;
/**
* Contains logic to remove all the storad data of a sequence. Methods of this
@@ -145,7 +142,6 @@
*/
private static void
completeTerminationOfReceivingSide(ConfigurationContext configContext, String
sequencePropertyKey,String sequenceId,
StorageManager storageManager) throws SandeshaException
{
- InvokerBeanMgr storageMapBeanMgr =
storageManager.getStorageMapBeanMgr();
NextMsgBeanMgr nextMsgBeanMgr =
storageManager.getNextMsgBeanMgr();
// removing nextMsgMgr entries
@@ -187,16 +183,6 @@
}
}
- private static boolean isRequiredForResponseSide(String name) {
- if (name == null &&
name.equals(Sandesha2Constants.SequenceProperties.LAST_OUT_MESSAGE_NO))
- return false;
-
- if
(name.equals(Sandesha2Constants.SequenceProperties.LAST_OUT_MESSAGE_NO))
- return false;
-
- return false;
- }
-
/**
* This is called by the sending side to clean data related to a
sequence.
* e.g. after sending the TerminateSequence message.
@@ -362,9 +348,8 @@
public static void addTerminateSequenceMessage(RMMsgContext
referenceMessage, String outSequenceId,
String sequencePropertyKey, StorageManager
storageManager) throws AxisFault {
-
- // / Transaction addTerminateSeqTransaction =
- // storageManager.getTransaction();
+ if(log.isDebugEnabled())
+ log.debug("Enter:
TerminateManager::addTerminateSequenceMessage " + outSequenceId);
SequencePropertyBeanMgr seqPropMgr =
storageManager.getSequencePropertyBeanMgr();
@@ -372,8 +357,8 @@
Sandesha2Constants.SequenceProperties.TERMINATE_ADDED);
if (terminated != null && terminated.getValue() != null &&
"true".equals(terminated.getValue())) {
- String message = "Terminate was added previously.";
- log.debug(message);
+ if(log.isDebugEnabled())
+ log.debug("Exit:
TerminateManager::addTerminateSequenceMessage - terminate was added
previously.");
return;
}
@@ -418,11 +403,6 @@
terminateRMMessage.setReplyTo(new EndpointReference
(replyToBean.getValue()));
}
- String addressingNamespaceURI =
SandeshaUtil.getSequenceProperty(sequencePropertyKey,
-
Sandesha2Constants.SequenceProperties.ADDRESSING_NAMESPACE_VALUE,
storageManager);
-
- String anonymousURI =
SpecSpecificConstants.getAddressingAnonymousURI(addressingNamespaceURI);
-
String rmVersion =
SandeshaUtil.getRMVersion(sequencePropertyKey, storageManager);
if (rmVersion == null)
throw new
SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotDecideRMVersion));
@@ -482,6 +462,9 @@
// / addTerminateSeqTransaction.commit();
SandeshaUtil.executeAndStore(terminateRMMessage, key);
+
+ if(log.isDebugEnabled())
+ log.debug("Exit:
TerminateManager::addTerminateSequenceMessage");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
