svn commit: r1137663 - in /cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy: interceptors/SecureConversationInInterceptor.java model/AsymmetricBinding.java

[coheigea]

Author: coheigea
Date: Mon Jun 20 15:28:38 2011
New Revision: 1137663

URL: http://svn.apache.org/viewvc?rev=1137663&view=rev
Log:
[CXF-3605] - Fix for expiry regression

Modified:
    
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
    
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AsymmetricBinding.java

Modified: 
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java?rev=1137663&r1=1137662&r2=1137663&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
 Mon Jun 20 15:28:38 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/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AsymmetricBinding.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AsymmetricBinding.java?rev=1137663&r1=1137662&r2=1137663&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AsymmetricBinding.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AsymmetricBinding.java
 Mon Jun 20 15:28:38 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;