svn commit: r640920 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/PolicyUtils.java

[dkulp]

Author: dkulp
Date: Tue Mar 25 11:07:34 2008
New Revision: 640920

URL: http://svn.apache.org/viewvc?rev=640920&view=rev
Log:
Merged revisions 640360 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r640360 | bharath | 2008-03-24 05:55:44 -0400 (Mon, 24 Mar 2008) | 2 lines
  
  Fix for CXF-1487. 
  http://www.nabble.com/WS-RM-BaseRetransmissionInterval-td13383409.html#a133834
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    
incubator/cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/PolicyUtils.java

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

Modified: 
incubator/cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/PolicyUtils.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/PolicyUtils.java?rev=640920&r1=640919&r2=640920&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/PolicyUtils.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/PolicyUtils.java
 Tue Mar 25 11:07:34 2008
@@ -88,7 +88,7 @@
         if (null != aval || null != bval) {
             InactivityTimeout ia = new RMAssertion.InactivityTimeout();
             if (null != aval && null != bval) {
-                ia.setMilliseconds(aval.max(bval));
+                ia.setMilliseconds(bval);
             } else {
                 ia.setMilliseconds(aval != null ? aval : bval);
             }
@@ -108,7 +108,7 @@
         if (null != aval || null != bval) {
             BaseRetransmissionInterval bri = new 
RMAssertion.BaseRetransmissionInterval();
             if (null != aval && null != bval) {
-                bri.setMilliseconds(aval.min(bval));
+                bri.setMilliseconds(bval);
             } else {
                 bri.setMilliseconds(aval != null ? aval : bval);
             }
@@ -128,7 +128,7 @@
         if (null != aval || null != bval) {
             AcknowledgementInterval ai = new 
RMAssertion.AcknowledgementInterval();
             if (null != aval && null != bval) {
-                ai.setMilliseconds(aval.min(bval));
+                ai.setMilliseconds(bval);
             } else {
                 ai.setMilliseconds(aval != null ? aval : bval);
             }