Author: dkulp
Date: Fri Jan 17 21:56:58 2014
New Revision: 1559260
URL: http://svn.apache.org/r1559260
Log:
Merged revisions 1559257 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1559257 | dkulp | 2014-01-17 16:43:42 -0500 (Fri, 17 Jan 2014) | 2 lines
[CXF-5442] Attempt to make sure no references are in place
........
Modified:
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java
Modified:
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java?rev=1559260&r1=1559259&r2=1559260&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java
Fri Jan 17 21:56:58 2014
@@ -69,7 +69,13 @@ public class CXFAuthenticator extends Au
}
try {
- ClassLoader loader = new URLClassLoader(new URL[0],
ClassLoader.getSystemClassLoader());
+ ClassLoader loader = AccessController.doPrivileged(new
PrivilegedAction<ClassLoader>() {
+ public ClassLoader run() {
+ return new URLClassLoader(new URL[0],
ClassLoader.getSystemClassLoader());
+ }
+ }, null);
+
+
Method m = ClassLoader.class.getDeclaredMethod("defineClass",
String.class,
byte[].class,
Integer.TYPE, Integer.TYPE);
@@ -94,9 +100,15 @@ public class CXFAuthenticator extends Au
});
}
+ try {
+ //clear the acc field that can hold onto the webapp
classloader
+ Field f = loader.getClass().getDeclaredField("acc");
+ ReflectionUtil.setAccessible(f).set(loader, null);
+ } catch (Throwable t) {
+ //ignore
+ }
} catch (Throwable t) {
//ignore
- t.printStackTrace();
}
}
}