You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2011/06/20 17:23:28 UTC
svn commit: r1137658 - in
/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy:
interceptors/SecureConversationInInterceptor.java
model/AsymmetricBinding.java
Author: coheigea
Date: Mon Jun 20 15:23:27 2011
New Revision: 1137658
URL: http://svn.apache.org/viewvc?rev=1137658&view=rev
Log:
[CXF-3605] - Fix for expiry regression
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AsymmetricBinding.java
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java?rev=1137658&r1=1137657&r2=1137658&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java Mon Jun 20 15:23:27 2011
@@ -359,7 +359,7 @@ class SecureConversationInInterceptor ex
throws Exception {
byte clientEntropy[] = null;
int keySize = 256;
- int ttl = 300000;
+ long ttl = 300000;
String tokenType = null;
Element el = DOMUtils.getFirstElement(requestEl);
while (el != null) {
@@ -387,7 +387,7 @@ class SecureConversationInInterceptor ex
Date created = new Date();
Date expires = new Date();
- expires.setTime(created.getTime() + (ttl * 1000));
+ expires.setTime(created.getTime() + ttl);
SecurityToken token = new SecurityToken(sct.getIdentifier(), created, expires);
token.setToken(sct.getElement());
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AsymmetricBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AsymmetricBinding.java?rev=1137658&r1=1137657&r2=1137658&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AsymmetricBinding.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AsymmetricBinding.java Mon Jun 20 15:23:27 2011
@@ -31,10 +31,8 @@ import org.apache.neethi.All;
import org.apache.neethi.ExactlyOne;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyComponent;
-import org.apache.neethi.PolicyContainingAssertion;
-public class AsymmetricBinding extends SymmetricAsymmetricBindingBase
- implements PolicyContainingAssertion {
+public class AsymmetricBinding extends SymmetricAsymmetricBindingBase {
private InitiatorToken initiatorToken;