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 2016/12/12 11:15:05 UTC
[1/2] cxf git commit: [CXF-7166] NullPointerException at
org.apache.cxf.common.jaxb.JAXBUtils.createJAXBContextProxy
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 <as...@redhat.com>
Authored: Mon Dec 12 11:18:36 2016 +0100
Committer: Alessio Soldano <as...@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);
}
}
}
[2/2] cxf git commit: Recording .gitmergeinfo Changes
Posted by as...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/922ec5d2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/922ec5d2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/922ec5d2
Branch: refs/heads/3.1.x-fixes
Commit: 922ec5d244f632c57ac5c3e6a3322c9d1a0abde1
Parents: e30c816
Author: Alessio Soldano <as...@redhat.com>
Authored: Mon Dec 12 12:14:32 2016 +0100
Committer: Alessio Soldano <as...@redhat.com>
Committed: Mon Dec 12 12:14:32 2016 +0100
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/922ec5d2/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index c405019..44822d4 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -243,6 +243,7 @@ M a9fe8470ce9522f08c298e58f76636c48d57b7a4
M abcc137cb9b27e0da0b4270a18ac2a32df1e9990
M b2b6f0137cd9f1bafff5d487e8383453692a2ff0
M b2e5fb6583d64deeb8a42d2eeb6935c5f33dc0c6
+M b49075882641fcebbbdf1ed8d84247fcf80aa558
M b624c034c5682b54b9faf3d3e90eb0c23cde1a5b
M c01c68ddda10ec6db492b86d818498bec0bf4228
M c212240f696e3387df19bbcf22d1851aff320078