You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by as...@apache.org on 2013/04/29 14:04:06 UTC
svn commit: r1476980 - in /cxf/branches/2.6.x-fixes: ./
rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/ReplayCacheFactory.java
rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java
Author: asoldano
Date: Mon Apr 29 12:04:06 2013
New Revision: 1476980
URL: http://svn.apache.org/r1476980
Log:
Merged revisions 1476975 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................
r1476975 | asoldano | 2013-04-29 13:45:15 +0200 (Mon, 29 Apr 2013) | 9 lines
Merged revisions 1476946 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1476946 | asoldano | 2013-04-29 11:47:22 +0200 (Mon, 29 Apr 2013) | 2 lines
[CXF-4991] EH-Cache availability checks in ReplayCacheFactory and TokenStoreFactory now performed using the defining classloader
........
................
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/ReplayCacheFactory.java
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/branches/2.7.x-fixes:r1476975
Merged /cxf/trunk:r1476946
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/ReplayCacheFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/ReplayCacheFactory.java?rev=1476980&r1=1476979&r2=1476980&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/ReplayCacheFactory.java (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/ReplayCacheFactory.java Mon Apr 29 12:04:06 2013
@@ -39,8 +39,7 @@ public abstract class ReplayCacheFactory
static {
try {
- Class<?> cacheManagerClass =
- ClassLoaderUtils.loadClass("net.sf.ehcache.CacheManager", ReplayCacheFactory.class);
+ Class<?> cacheManagerClass = Class.forName("net.sf.ehcache.CacheManager");
if (cacheManagerClass != null) {
ehCacheInstalled = true;
}
Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.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/TokenStoreFactory.java?rev=1476980&r1=1476979&r2=1476980&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java Mon Apr 29 12:04:06 2013
@@ -38,8 +38,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;
}