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 2011/06/17 15:08:09 UTC
svn commit: r1136870 - in /cxf/branches/2.4.x-fixes: ./
rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
Author: ay
Date: Fri Jun 17 13:08:09 2011
New Revision: 1136870
URL: http://svn.apache.org/viewvc?rev=1136870&view=rev
Log:
Merged revisions 1136417 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1136417 | ay | 2011-06-16 14:56:14 +0200 (Thu, 16 Jun 2011) | 1 line
[CXF-3594] WS-RM server not honoring the Expires value set in the CreateSeqeunce message
........
Added:
cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
- copied unchanged from r1136417, cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 17 13:08:09 2011
@@ -1 +1 @@
-/cxf/trunk:1134248,1134281,1134523,1135484,1135899,1136380
+/cxf/trunk:1134248,1134281,1134523,1135484,1135899,1136380,1136417
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun 17 13:08:09 2011
@@ -1 +1 @@
-/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1135457,1135484,1135899,1136380
+/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1135457,1135484,1135899,1136380,1136417
Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java?rev=1136870&r1=1136869&r2=1136870&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java (original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java Fri Jun 17 13:08:09 2011
@@ -137,9 +137,12 @@ public class Servant implements Invoker
}
Expires ex = create.getExpires();
- if (null != ex || supportedDuration.isShorterThan(DatatypeFactory.PT0S)) {
- Duration effectiveDuration = supportedDuration;
- if (null != ex && supportedDuration.isLongerThan(ex.getValue())) {
+ if (null != ex) {
+ Duration effectiveDuration = ex.getValue();
+ // PT0S represents 0 second and the shortest duration but in ws-rm, considered the longest
+ if (DatatypeFactory.PT0S.equals(effectiveDuration)
+ || (!DatatypeFactory.PT0S.equals(supportedDuration)
+ && supportedDuration.isShorterThan(effectiveDuration))) {
effectiveDuration = supportedDuration;
}
ex = RMUtils.getWSRMFactory().createExpires();