cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1308906 - in /cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore: EHCacheTokenStore.java SecurityToken.java
Date Tue, 03 Apr 2012 13:44:59 GMT
Author: coheigea
Date: Tue Apr  3 13:44:59 2012
New Revision: 1308906

URL: http://svn.apache.org/viewvc?rev=1308906&view=rev
Log:
[CXF-4219] - Remove EhCache warning message about max cache size

Modified:
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java?rev=1308906&r1=1308905&r2=1308906&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
(original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
Tue Apr  3 13:44:59 2012
@@ -40,6 +40,7 @@ public class EHCacheTokenStore implement
 
     public static final long DEFAULT_TTL = 3600L;
     public static final long MAX_TTL = DEFAULT_TTL * 12L;
+    public static final int MAX_ELEMENTS = 1000000;
     
     private Cache cache;
     private CacheManager cacheManager;
@@ -56,7 +57,7 @@ public class EHCacheTokenStore implement
         
         if (!cacheManager.cacheExists(key)) {
             // Cannot overflow to disk as SecurityToken Elements can't be serialized
-            cache = new Cache(key, 0, false, false, DEFAULT_TTL, DEFAULT_TTL);
+            cache = new Cache(key, MAX_ELEMENTS, false, false, DEFAULT_TTL, DEFAULT_TTL);
             cacheManager.addCache(cache);
         } else {
             cache = cacheManager.getCache(key);

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java?rev=1308906&r1=1308905&r2=1308906&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java
(original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java
Tue Apr  3 13:44:59 2012
@@ -43,7 +43,7 @@ import org.apache.ws.security.util.XmlSc
  */
 public class SecurityToken implements Serializable {
     
-    private static final long serialVersionUID = -8023092932997444513L;
+    private static final long serialVersionUID = 3820740387121650613L;
 
     /**
      * Token identifier
@@ -91,11 +91,6 @@ public class SecurityToken implements Se
     private Properties properties;
 
     /**
-     * A flag to assist the TokenStorage
-     */
-    private boolean changed;
-    
-    /**
      * The secret associated with the Token
      */
     private byte[] secret;
@@ -211,20 +206,6 @@ public class SecurityToken implements Se
     }
 
     /**
-     * @return Returns the changed.
-     */
-    public boolean isChanged() {
-        return changed;
-    }
-
-    /**
-     * @param chnaged The changed to set.
-     */
-    public void setChanged(boolean chnaged) {
-        this.changed = chnaged;
-    }
-    
-    /**
      * @return Returns the properties.
      */
     public Properties getProperties() {



Mime
View raw message