Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 66549 invoked from network); 24 Mar 2008 13:09:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Mar 2008 13:09:06 -0000 Received: (qmail 19323 invoked by uid 500); 24 Mar 2008 13:09:05 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 19199 invoked by uid 500); 24 Mar 2008 13:09:04 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Delivered-To: moderator for cxf-commits@incubator.apache.org Received: (qmail 50612 invoked by uid 99); 24 Mar 2008 09:56:14 -0000 X-ASF-Spam-Status: No, hits=-1999.8 required=10.0 tests=ALL_TRUSTED,WHOIS_MYPRIVREG X-Spam-Check-By: apache.org Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r640360 - /incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/PolicyUtils.java Date: Mon, 24 Mar 2008 09:55:44 -0000 To: cxf-commits@incubator.apache.org From: bharath@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080324095545.04FCD1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bharath Date: Mon Mar 24 02:55:44 2008 New Revision: 640360 URL: http://svn.apache.org/viewvc?rev=640360&view=rev Log: Fix for CXF-1487. http://www.nabble.com/WS-RM-BaseRetransmissionInterval-td13383409.html#a133834 Modified: incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/PolicyUtils.java Modified: incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/PolicyUtils.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/PolicyUtils.java?rev=640360&r1=640359&r2=640360&view=diff ============================================================================== --- incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/PolicyUtils.java (original) +++ incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/PolicyUtils.java Mon Mar 24 02:55:44 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); }