You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cxf.apache.org by Glen Mazza <gl...@verizon.net> on 2008/03/25 00:44:23 UTC
Re: svn commit: r640360 -
/incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/PolicyUtils.java
Am Montag, den 24.03.2008, 09:55 +0000 schrieb bharath@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);
> }
consider for above and two below:
if (bval != null) {
ia.setMilliseconds(bval);
} else {
ia.setMilliseconds(aval);
}
or
ia.setMilliseconds((bval==null)? aval:bval);
Regards,
Glen
> @@ -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);
> }
>
>