geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r426728 - in /geronimo/sandbox/svkmerge/trunk: ./ applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
Date Sat, 29 Jul 2006 00:40:33 GMT
Author: jdillon
Date: Fri Jul 28 17:40:32 2006
New Revision: 426728

URL: http://svn.apache.org/viewvc?rev=426728&view=rev
Log:
 r593@Bliss (orig r426681):  jbohn | 2006-07-28 15:09:31 -0700
 GERONIMO-2235 fix serialization error due to KeystoreInstance in session

Modified:
    geronimo/sandbox/svkmerge/trunk/   (props changed)
    geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java

Propchange: geronimo/sandbox/svkmerge/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Jul 28 17:40:32 2006
@@ -1,2 +1,2 @@
 13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419395
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:426617
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:426681

Modified: geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java?rev=426728&r1=426727&r2=426728&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
(original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
Fri Jul 28 17:40:32 2006
@@ -70,7 +70,7 @@
     }
 
     public final static class KeystoreData implements Serializable {
-        private KeystoreInstance instance;
+        private transient KeystoreInstance instance;
         private char[] password;
         private String[] certificates;
         private String[] keys;



Mime
View raw message