Repository: cxf Updated Branches: refs/heads/master e50e87ddb -> 412fcccef
[CXF-5668] Set explicit parent to ProxyClassloader Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/412fccce Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/412fccce Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/412fccce Branch: refs/heads/master Commit: 412fcccef8cebaf94b8eebb827672add984ff47c Parents: e50e87d Author: Alessio Soldano <[email protected]> Authored: Wed Apr 2 18:45:43 2014 +0200 Committer: Alessio Soldano <[email protected]> Committed: Wed Apr 2 18:46:32 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/cxf/common/util/ProxyClassLoader.java | 7 +++++-- .../src/main/java/org/apache/cxf/common/util/ProxyHelper.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/412fccce/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java b/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java index f7de519..f14e61f 100644 --- a/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java +++ b/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java @@ -32,10 +32,13 @@ public class ProxyClassLoader extends ClassLoader { private final Set<ClassLoader> loaders = new HashSet<ClassLoader>(); private boolean checkSystem; - public ProxyClassLoader() { + public ProxyClassLoader(ClassLoader parent) { + super(parent); classes = null; } - public ProxyClassLoader(Class<?>[] cls) { + + public ProxyClassLoader(ClassLoader parent, Class<?>[] cls) { + super(parent); classes = cls; } http://git-wip-us.apache.org/repos/asf/cxf/blob/412fccce/core/src/main/java/org/apache/cxf/common/util/ProxyHelper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/util/ProxyHelper.java b/core/src/main/java/org/apache/cxf/common/util/ProxyHelper.java index c252574..27f2c56 100644 --- a/core/src/main/java/org/apache/cxf/common/util/ProxyHelper.java +++ b/core/src/main/java/org/apache/cxf/common/util/ProxyHelper.java @@ -58,7 +58,7 @@ public class ProxyHelper { if (canSeeAllInterfaces(loader, interfaces)) { return loader; } - ProxyClassLoader combined = new ProxyClassLoader(interfaces); + ProxyClassLoader combined = new ProxyClassLoader(loader, interfaces); for (Class<?> currentInterface : interfaces) { combined.addLoader(currentInterface.getClassLoader()); }
