svn commit: r1366528 - /cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessTokenValidation.java

[dkulp]

Author: dkulp
Date: Fri Jul 27 20:47:11 2012
New Revision: 1366528

URL: http://svn.apache.org/viewvc?rev=1366528&view=rev
Log:
Merged revisions 1365734 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1365734 | dkulp | 2012-07-25 16:48:54 -0400 (Wed, 25 Jul 2012) | 2 lines

  Fix deprecation warning

........

Modified:
    
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessTokenValidation.java

Modified: 
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessTokenValidation.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessTokenValidation.java?rev=1366528&r1=1366527&r2=1366528&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessTokenValidation.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessTokenValidation.java
 Fri Jul 27 20:47:11 2012
@@ -57,7 +57,7 @@ public class AccessTokenValidation {
         this.tokenType = token.getTokenType();
         this.tokenGrantType = token.getGrantType();
         this.tokenIssuedAt = token.getIssuedAt();
-        this.tokenLifetime = token.getLifetime();
+        this.tokenLifetime = token.getExpiresIn();
         
         this.tokenSubject = token.getSubject();
         this.tokenScopes = token.getScopes();