Author: coheigea Date: Mon Dec 2 16:53:35 2013 New Revision: 1547103 URL: http://svn.apache.org/r1547103 Log: Merged revisions 1547083 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1547083 | coheigea | 2013-12-02 16:22:05 +0000 (Mon, 02 Dec 2013) | 10 lines Merged revisions 1547076 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1547076 | coheigea | 2013-12-02 16:04:56 +0000 (Mon, 02 Dec 2013) | 2 lines Don't serialize SecurityToken secrets ........ ........ Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java?rev=1547103&r1=1547102&r2=1547103&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java (original) +++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java Mon Dec 2 16:53:35 2013 @@ -88,7 +88,7 @@ public class SecurityToken implements Se /** * The secret associated with the Token */ - private byte[] secret; + private transient byte[] secret; /** * Created time
