You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2013/04/16 16:29:10 UTC
svn commit: r1468436 -
/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
Author: ay
Date: Tue Apr 16 14:29:09 2013
New Revision: 1468436
URL: http://svn.apache.org/r1468436
Log:
[CXF-4964] NPE is thrown when WS-RM's destination has no ackPolicy configured
Modified:
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java?rev=1468436&r1=1468435&r2=1468436&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java Tue Apr 16 14:29:09 2013
@@ -401,7 +401,7 @@ public class DestinationSequence extends
void scheduleAcknowledgement(long acknowledgementInterval) {
AcksPolicyType ap = destination.getManager().getDestinationPolicy().getAcksPolicy();
- if (acknowledgementInterval > 0 && getMonitor().getMPM() >= ap.getIntraMessageThreshold()) {
+ if (acknowledgementInterval > 0 && getMonitor().getMPM() >= (ap == null ? 10 : ap.getIntraMessageThreshold())) {
LOG.fine("Schedule deferred acknowledgment");
scheduleDeferredAcknowledgement(acknowledgementInterval);
} else {
@@ -409,7 +409,7 @@ public class DestinationSequence extends
scheduleImmediateAcknowledgement();
destination.getManager().getTimer().schedule(
- new ImmediateFallbackAcknowledgment(), ap.getImmediaAcksTimeout());
+ new ImmediateFallbackAcknowledgment(), ap == null ? 1000L : ap.getImmediaAcksTimeout());
}
}