Author: gatfora
Date: Thu Jul 3 02:45:58 2008
New Revision: 673637
URL: http://svn.apache.org/viewvc?rev=673637&view=rev
Log:
Remove unused imports/variables. Fix a problem where an ACK is piggybacked on
a MakeConnection - the message isn't processed in the RMMessageReceiver as the
MsgType is an Ack, not a MC
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
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/msgreceivers/RMMessageReceiver.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.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/util/MsgInitializer.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SequenceManager.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaUtilTest.java
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java?rev=673637&r1=673636&r2=673637&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
Thu Jul 3 02:45:58 2008
@@ -160,6 +160,7 @@
private static void processApplicationMessage(RMMsgContext rmMsgCtx) throws
AxisFault {
if (LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled())
log.debug("Enter: SandeshaGlobalInHandler::processApplicationMessage");
+ System.out.println("Processing Application Msg");
// Check if this is a duplicate message
Sequence sequence = rmMsgCtx.getSequence();
String sequenceId = sequence.getIdentifier().getIdentifier();
@@ -263,6 +264,12 @@
if(transaction != null && transaction.isActive()) transaction.commit();
transaction = null;
+ }catch (RuntimeException e)
+ {
+
+ if (LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled())
+ log.debug("Exit:
SandeshaGlobalInHandler::processApplicationMessage", e);
+ throw e;
}
finally {
if (transaction != null && transaction.isActive())
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=673637&r1=673636&r2=673637&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
Thu Jul 3 02:45:58 2008
@@ -22,7 +22,6 @@
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.AddressingHelper;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.RelatesTo;
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java?rev=673637&r1=673636&r2=673637&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java
Thu Jul 3 02:45:58 2008
@@ -80,8 +80,8 @@
new
Exception(), null);
else
throw new
AxisFault(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.reliableMessagingNotEnabled,
msgCtx.getAxisService().getName()));
-
- log.debug("Exit:
RMMessageReceiver::invokeBusinessLogic, Service has disabled RM ");
+ if (log.isDebugEnabled())
+ log.debug("Exit:
RMMessageReceiver::invokeBusinessLogic, Service has disabled RM ");
return;
}
}
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java?rev=673637&r1=673636&r2=673637&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java
Thu Jul 3 02:45:58 2008
@@ -74,12 +74,13 @@
private class DummyTransaction extends ReentrantLock implements
Transaction {
+ private static final long serialVersionUID =
-8095723965216941864L;
+
public void commit() throws SandeshaStorageException {
throw new SandeshaStorageException("Not supported");
}
public boolean isActive() {
- // TODO Auto-generated method stub
return false;
}
@@ -89,7 +90,7 @@
}
- public void enlist(RMBean bean) throws SandeshaStorageException {
+ public void enlist(RMBean bean) {
if(LoggingControl.isAnyTracingEnabled() &&
log.isDebugEnabled()) log.debug("Entry: InMemoryTransaction::enlist, " + bean);
if (bean != null) {
DummyTransaction tran = 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=673637&r1=673636&r2=673637&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
Thu Jul 3 02:45:58 2008
@@ -63,8 +63,6 @@
if (LoggingControl.isAnyTracingEnabled() &&
log.isDebugEnabled())
log.debug("Enter:
AcknowledgementManager::piggybackAcksIfPresent");
- SenderBeanMgr retransmitterBeanMgr =
storageManager.getSenderBeanMgr();
-
// If this message is going to an anonymous address, and the
inbound
// sequence has
// anonymous acksTo, then we add in an ack for the inbound
sequence.
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/MsgInitializer.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/MsgInitializer.java?rev=673637&r1=673636&r2=673637&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/MsgInitializer.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/MsgInitializer.java
Thu Jul 3 02:45:58 2008
@@ -180,13 +180,13 @@
rmMsgContext.setMessageType(Sandesha2Constants.MessageTypes.APPLICATION);
sequenceID = sequence.getIdentifier().getIdentifier();
- } else if (sequenceAcknowledgementsIter.hasNext()) {
-
rmMsgContext.setMessageType(Sandesha2Constants.MessageTypes.ACK);
- SequenceAcknowledgement sequenceAcknowledgement =
(SequenceAcknowledgement) sequenceAcknowledgementsIter.next();
-
- //if there is only on sequenceAck, sequenceId will be
set. Otherwise it will not be.
- if (!sequenceAcknowledgementsIter.hasNext())
- sequenceID =
sequenceAcknowledgement.getIdentifier().getIdentifier();
+ } else if (makeConnection != null){
+
rmMsgContext.setMessageType(Sandesha2Constants.MessageTypes.MAKE_CONNECTION_MSG);
+ if (makeConnection.getIdentifier()!=null) {
+ sequenceID =
makeConnection.getIdentifier().getIdentifier();
+ } else if (makeConnection.getAddress()!=null){
+ //TODO get sequenceId based on the anonymous
address.
+ }
} else if (ackRequestedIter.hasNext()) {
rmMsgContext.setMessageType(Sandesha2Constants.MessageTypes.ACK_REQUEST);
AckRequested ackRequest = (AckRequested)
ackRequestedIter.next();
@@ -200,13 +200,15 @@
} else if (closeSequenceResponse != null) {
rmMsgContext.setMessageType(Sandesha2Constants.MessageTypes.CLOSE_SEQUENCE_RESPONSE);
sequenceID =
closeSequenceResponse.getIdentifier().getIdentifier();
- } else if (makeConnection != null){
-
rmMsgContext.setMessageType(Sandesha2Constants.MessageTypes.MAKE_CONNECTION_MSG);
- if (makeConnection.getIdentifier()!=null) {
- sequenceID =
makeConnection.getIdentifier().getIdentifier();
- } else if (makeConnection.getAddress()!=null){
- //TODO get sequenceId based on the anonymous
address.
- }
+
+ // As an ACK can be piggybacked on all the other
message types - check for ACK last.
+ } else if (sequenceAcknowledgementsIter.hasNext()) {
+
rmMsgContext.setMessageType(Sandesha2Constants.MessageTypes.ACK);
+ SequenceAcknowledgement sequenceAcknowledgement =
(SequenceAcknowledgement) sequenceAcknowledgementsIter.next();
+
+ //if there is only on sequenceAck, sequenceId will be
set. Otherwise it will not be.
+ if (!sequenceAcknowledgementsIter.hasNext())
+ sequenceID =
sequenceAcknowledgement.getIdentifier().getIdentifier();
} else
rmMsgContext.setMessageType(Sandesha2Constants.MessageTypes.UNKNOWN);
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java?rev=673637&r1=673636&r2=673637&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
Thu Jul 3 02:45:58 2008
@@ -464,7 +464,7 @@
public static void assertProofOfPossession(RMSequenceBean bean,
MessageContext context, OMElement elementToCheck)throws SandeshaException{
if (LoggingControl.isAnyTracingEnabled() &&
log.isDebugEnabled())
- log.debug("Enter: SandeshaUtil::assertProofOfPossession
:" + bean + ", " + context + ", " + elementToCheck.getQName());
+ log.debug("Enter: SandeshaUtil::assertProofOfPossession
:" + bean + ", " + context + ", " + (elementToCheck!=null ?
elementToCheck.getQName() : null));
String tokenData = null;
if(bean!=null){
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=673637&r1=673636&r2=673637&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
Thu Jul 3 02:45:58 2008
@@ -19,15 +19,10 @@
package org.apache.sandesha2.util;
-import java.util.Iterator;
-
-import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.addressing.EndpointReferenceHelper;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.Parameter;
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaUtilTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaUtilTest.java?rev=673637&r1=673636&r2=673637&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaUtilTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaUtilTest.java
Thu Jul 3 02:45:58 2008
@@ -65,7 +65,7 @@
}
- public void testGetAckRangesFromRangeStringOutOfOrder()throws
SandeshaException{
+ public void testGetAckRangesFromRangeStringOutOfOrder() {
RangeString rangeString = new RangeString();
rangeString.addRange(new Range(3));
@@ -102,7 +102,7 @@
assertFalse(it.hasNext());
}
- public void testGetAckRangesFromRangeStringGapFilling () throws
SandeshaException {
+ public void testGetAckRangesFromRangeStringGapFilling () {
//build a range string to represent the completed messages
RangeString rangeString = new RangeString();
rangeString.addRange(new Range(1,3));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
