You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2013/09/02 14:03:59 UTC
svn commit: r1519402 - in /cxf/branches/2.7.x-fixes: ./
rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/SamlUserSubject.java
Author: sergeyb
Date: Mon Sep 2 12:03:59 2013
New Revision: 1519402
URL: http://svn.apache.org/r1519402
Log:
Merged revisions 1519401 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1519401 | sergeyb | 2013-09-02 13:02:16 +0100 (Mon, 02 Sep 2013) | 1 line
Adding a serial version id to SamlUserSubject
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/SamlUserSubject.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1519401
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/SamlUserSubject.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/SamlUserSubject.java?rev=1519402&r1=1519401&r2=1519402&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/SamlUserSubject.java (original)
+++ cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/SamlUserSubject.java Mon Sep 2 12:03:59 2013
@@ -24,8 +24,7 @@ import org.apache.cxf.rs.security.oauth2
import org.apache.cxf.rs.security.saml.assertion.Claims;
public class SamlUserSubject extends UserSubject {
- private static final long serialVersionUID = 1L;
-
+ private static final long serialVersionUID = -1135272749329239037L;
private Claims claims;
public SamlUserSubject(String user,
List<String> roles,