cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1468452 - in /cxf/branches/2.6.x-fixes: ./ rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
Date Tue, 16 Apr 2013 15:02:47 GMT
Author: ay
Date: Tue Apr 16 15:02:47 2013
New Revision: 1468452

URL: http://svn.apache.org/r1468452
Log:
Merged revisions 1468437 via  svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1468437 | ay | 2013-04-16 16:31:54 +0200 (Tue, 16 Apr 2013) | 9 lines
  
  Merged revisions 1468436 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1468436 | ay | 2013-04-16 16:29:09 +0200 (Tue, 16 Apr 2013) | 1 line
    
    [CXF-4964] NPE is thrown when WS-RM's destination has no ackPolicy configured
  ........
  
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java?rev=1468452&r1=1468451&r2=1468452&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
Tue Apr 16 15:02:47 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());
            
         }
     }



Mime
View raw message