Author: gatfora
Date: Fri Mar 9 06:47:35 2007
New Revision: 516422
URL: http://svn.apache.org/viewvc?view=rev&rev=516422
Log:
Move propertiesToCopyFromReferenceMessage in module.xml as it was stopping
policy info from being loaded. Also fix several NullPointerExceptions in
Sender and PollingManager
Modified:
webservices/sandesha/trunk/java/config/module.xml
webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Sender.java
Modified: webservices/sandesha/trunk/java/config/module.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/config/module.xml?view=diff&rev=516422&r1=516421&r2=516422
==============================================================================
--- webservices/sandesha/trunk/java/config/module.xml (original)
+++ webservices/sandesha/trunk/java/config/module.xml Fri Mar 9 06:47:35 2007
@@ -35,10 +35,6 @@
<order phase="RMPhase"/>
</handler>
</OutFaultFlow>
-
- <!-- Parameters that will be copied when creating related MessageContexts
-->
- <parameter name="propertiesToCopyFromReferenceMessage"
locked="false">TransportURL,WSAddressingVersion,disableAddressingForOutMessages,rampartPolicy,RECV_RESULTS,PROXY</parameter>
- <parameter name="propertiesToCopyFromReferenceRequestMessage"
locked="false">WSAddressingVersion,RECV_RESULTS,rampartPolicy</parameter>
<operation name="RMInOnlyOperation"
mep="http://www.w3.org/2006/01/wsdl/in-only";>
<messageReceiver
class="org.apache.sandesha2.msgreceivers.RMMessageReceiver"/>
@@ -137,5 +133,10 @@
</wsp:Policy>
</sandesha2:RMAssertion>
</wsp:Policy>
-
+
+
+ <!-- Parameters that will be copied when creating related MessageContexts
-->
+ <parameter name="propertiesToCopyFromReferenceMessage"
locked="false">TransportURL,WSAddressingVersion,disableAddressingForOutMessages,rampartPolicy,RECV_RESULTS,PROXY</parameter>
+ <parameter name="propertiesToCopyFromReferenceRequestMessage"
locked="false">WSAddressingVersion,RECV_RESULTS,rampartPolicy</parameter>
+
</module>
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=516422&r1=516421&r2=516422
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java
Fri Mar 9 06:47:35 2007
@@ -135,11 +135,15 @@
// This sequence must have been terminated, or deleted
stopThreadForSequence(entry.getSequenceId(), true);
} else {
+ if (log.isDebugEnabled())
+ log.debug("Polling rms " + beanToPoll);
// The sequence is there, but we still only poll if we
are expecting reply messages,
// or if we don't have clean ack state.
- boolean cleanAcks =
AcknowledgementManager.verifySequenceCompletion(beanToPoll.getClientCompletedMessages(),
beanToPoll.getNextMessageNumber());
+ boolean cleanAcks = false;
+ if (beanToPoll.getNextMessageNumber() > -1)
+ cleanAcks =
AcknowledgementManager.verifySequenceCompletion(beanToPoll.getClientCompletedMessages(),
beanToPoll.getNextMessageNumber());
long repliesExpected = beanToPoll.getExpectedReplies();
- if(force || !cleanAcks || repliesExpected > 0)
+ if((force || !cleanAcks || repliesExpected > 0) &&
beanToPoll.getReferenceMessageStoreKey() != null)
pollForSequence(beanToPoll.getAnonymousUUID(),
beanToPoll.getInternalSequenceID(), beanToPoll.getReferenceMessageStoreKey(),
beanToPoll, entry);
}
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Sender.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Sender.java?view=diff&rev=516422&r1=516421&r2=516422
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Sender.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Sender.java
Fri Mar 9 06:47:35 2007
@@ -103,7 +103,7 @@
if(rms != null && !rms.isTerminated() &&
!rms.isTimedOut()) {
sequenceId = rms.getSequenceID();
if
(SequenceManager.hasSequenceTimedOut(rms, sequenceId, storageManager))
-
SequenceManager.finalizeTimedOutSequence(sequenceId, null, storageManager);
+
SequenceManager.finalizeTimedOutSequence(rms.getInternalSequenceID(), null,
storageManager);
else
found = true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
