cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [01/12] cxf git commit: [CXF-7166] NullPointerException at org.apache.cxf.common.jaxb.JAXBUtils.createJAXBContextProxy
Date Thu, 16 Mar 2017 13:06:49 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 294709fcb -> 3f4f378c3


[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/5d2322ca
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5d2322ca
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5d2322ca

Branch: refs/heads/3.0.x-fixes
Commit: 5d2322ca924b642986a616fb5a4353f5f516678f
Parents: 294709f
Author: Alessio Soldano <asoldano@redhat.com>
Authored: Mon Dec 12 11:18:36 2016 +0100
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Wed Mar 15 14:47:48 2017 -0400

----------------------------------------------------------------------
 .../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/5d2322ca/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 bb859f4..be02e4f 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
@@ -68,11 +68,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;
         }
@@ -236,7 +231,8 @@ public final class JAXBContextCache {
                         JAXBCONTEXT_CACHE.remove(cachedContextAndSchemasInternal.getClasses());
                         cachedContextAndSchemasInternal = null;
                     } else {
-                        return new CachedContextAndSchemas(cachedContextAndSchemasInternal);
+                        return new CachedContextAndSchemas(context, cachedContextAndSchemasInternal.getClasses(),
+                            cachedContextAndSchemasInternal);
                     }
                 }
             }


Mime
View raw message