Repository: cxf Updated Branches: refs/heads/3.1.x-fixes ec33f44cc -> 922ec5d24
[CXF-7166] NullPointerException at org.apache.cxf.common.jaxb.JAXBUtils.createJAXBContextProxy Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e30c816f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e30c816f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e30c816f Branch: refs/heads/3.1.x-fixes Commit: e30c816fbbaa3c589062d2ae0202fc47ddd7d70b Parents: ec33f44 Author: Alessio Soldano <asold...@redhat.com> Authored: Mon Dec 12 11:18:36 2016 +0100 Committer: Alessio Soldano <asold...@redhat.com> Committed: Mon Dec 12 12:13:33 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/cxf/common/jaxb/JAXBContextCache.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/e30c816f/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java index d6393d2..dcbe9fc 100644 --- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java +++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java @@ -69,11 +69,6 @@ public final class JAXBContextCache { this.classes = classes; ccas = new WeakReference<CachedContextAndSchemasInternal>(i); } - private CachedContextAndSchemas(CachedContextAndSchemasInternal i) { - this.context = i.getContext(); - this.classes = i.getClasses(); - ccas = new WeakReference<CachedContextAndSchemasInternal>(i); - } public JAXBContext getContext() { return context; } @@ -237,7 +232,8 @@ public final class JAXBContextCache { JAXBCONTEXT_CACHE.remove(cachedContextAndSchemasInternal.getClasses()); cachedContextAndSchemasInternal = null; } else { - return new CachedContextAndSchemas(cachedContextAndSchemasInternal); + return new CachedContextAndSchemas(context, cachedContextAndSchemasInternal.getClasses(), + cachedContextAndSchemasInternal); } } }
