Author: dkulp
Date: Fri Sep 23 21:09:11 2011
New Revision: 1175022
URL: http://svn.apache.org/viewvc?rev=1175022&view=rev
Log:
Merged revisions 1175021 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1175021 | dkulp | 2011-09-23 17:07:10 -0400 (Fri, 23 Sep 2011) | 2 lines
[CXF-3820] Make security token serializable
Patch from Anubhav Sharma applied
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java
Propchange: cxf/branches/2.4.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.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.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java?rev=1175022&r1=1175021&r2=1175022&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java
(original)
+++
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java
Fri Sep 23 21:09:11 2011
@@ -19,6 +19,7 @@
package org.apache.cxf.ws.security.tokenstore;
+import java.io.Serializable;
import java.security.cert.X509Certificate;
import java.text.DateFormat;
import java.text.ParseException;
@@ -39,7 +40,10 @@ import org.apache.ws.security.util.XmlSc
/**
*
*/
-public class SecurityToken {
+public class SecurityToken implements Serializable {
+
+ private static final long serialVersionUID = -8023092932997444513L;
+
public enum State {
UNKNOWN,
ISSUED,
@@ -142,7 +146,7 @@ public class SecurityToken {
private X509Certificate x509cert;
- private Crypto crypto;
+ private transient Crypto crypto;
public SecurityToken() {
