You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by co...@apache.org on 2013/04/29 16:27:16 UTC

svn commit: r1477099 - /cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java

Author: coheigea
Date: Mon Apr 29 14:27:16 2013
New Revision: 1477099

URL: http://svn.apache.org/r1477099
Log:
[CXF-4991] EH-Cache availability checks in ReplayCacheFactory and TokenStoreFactory now performed using the defining classloader


Conflicts:

	rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/ReplayCacheFactory.java

Modified:
    cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java

Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java?rev=1477099&r1=1477098&r2=1477099&view=diff
==============================================================================
--- cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java (original)
+++ cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java Mon Apr 29 14:27:16 2013
@@ -37,8 +37,7 @@ public abstract class TokenStoreFactory 
     
     static {
         try {
-            Class<?> cacheManagerClass = 
-                ClassLoaderUtils.loadClass("net.sf.ehcache.CacheManager", TokenStoreFactory.class);
+            Class<?> cacheManagerClass = Class.forName("net.sf.ehcache.CacheManager");
             if (cacheManagerClass != null) {
                 ehCacheInstalled = true;
             }