Author: coheigea Date: Wed Mar 13 11:10:25 2013 New Revision: 1455885 URL: http://svn.apache.org/r1455885 Log: Merged revisions 1455876 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1455876 | coheigea | 2013-03-13 10:47:59 +0000 (Wed, 13 Mar 2013) | 18 lines Merged revisions 1455864 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1455864 | coheigea | 2013-03-13 10:15:50 +0000 (Wed, 13 Mar 2013) | 10 lines Merged revisions 1455859 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1455859 | coheigea | 2013-03-13 10:09:32 +0000 (Wed, 13 Mar 2013) | 2 lines Get a new SPNEGO token on expiry ........ ........ ........ Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoContextTokenOutInterceptor.java Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoContextTokenOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoContextTokenOutInterceptor.java?rev=1455885&r1=1455884&r2=1455885&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoContextTokenOutInterceptor.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoContextTokenOutInterceptor.java Wed Mar 13 11:10:25 2013 @@ -63,7 +63,7 @@ class SpnegoContextTokenOutInterceptor e tok = NegotiationUtils.getTokenStore(message).getToken(tokId); } } - if (tok == null) { + if (tok == null || !tok.isExpired()) { tok = issueToken(message, aim); } if (tok != null) {
