Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B68E1200C39 for ; Thu, 16 Mar 2017 14:06:51 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B5415160B97; Thu, 16 Mar 2017 13:06:51 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1535A160B78 for ; Thu, 16 Mar 2017 14:06:50 +0100 (CET) Received: (qmail 54103 invoked by uid 500); 16 Mar 2017 13:06:50 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 54080 invoked by uid 99); 16 Mar 2017 13:06:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Mar 2017 13:06:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C6037E1835; Thu, 16 Mar 2017 13:06:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkulp@apache.org To: commits@cxf.apache.org Date: Thu, 16 Mar 2017 13:06:49 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [01/12] cxf git commit: [CXF-7166] NullPointerException at org.apache.cxf.common.jaxb.JAXBUtils.createJAXBContextProxy archived-at: Thu, 16 Mar 2017 13:06:51 -0000 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 Authored: Mon Dec 12 11:18:36 2016 +0100 Committer: Daniel Kulp 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(i); } - private CachedContextAndSchemas(CachedContextAndSchemasInternal i) { - this.context = i.getContext(); - this.classes = i.getClasses(); - ccas = new WeakReference(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); } } }