From commits-return-2390-archive-asf-public=cust-asf.ponee.io@bval.apache.org Tue Oct 16 19:31:16 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 7DDE1180674 for ; Tue, 16 Oct 2018 19:31:15 +0200 (CEST) Received: (qmail 68279 invoked by uid 500); 16 Oct 2018 17:31:06 -0000 Mailing-List: contact commits-help@bval.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@bval.apache.org Delivered-To: mailing list commits@bval.apache.org Received: (qmail 67931 invoked by uid 99); 16 Oct 2018 17:31:06 -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; Tue, 16 Oct 2018 17:31:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DC936E11CC; Tue, 16 Oct 2018 17:31:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mbenson@apache.org To: commits@bval.apache.org Date: Tue, 16 Oct 2018 17:31:35 -0000 Message-Id: <1422c5afef864999b2c7e64f93b7f42c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [31/50] bval git commit: avoid NPE on xml ctors avoid NPE on xml ctors Project: http://git-wip-us.apache.org/repos/asf/bval/repo Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/e5e22d3e Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/e5e22d3e Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/e5e22d3e Branch: refs/heads/bv2 Commit: e5e22d3e650e4960657e4fdbdd10f61691b8a9a0 Parents: e243ee9 Author: Matt Benson Authored: Wed Apr 18 17:16:42 2018 -0500 Committer: Matt Benson Committed: Tue Oct 16 12:28:20 2018 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/bval/jsr/xml/MappingValidator.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bval/blob/e5e22d3e/bval-jsr/src/main/java/org/apache/bval/jsr/xml/MappingValidator.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/MappingValidator.java b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/MappingValidator.java index f3b017e..9b9f4a4 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/MappingValidator.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/MappingValidator.java @@ -166,10 +166,11 @@ public class MappingValidator { final Constructor dc = Reflection.getDeclaredConstructor(t, parameterTypes); Exceptions.raiseIf(dc == null, ValidationException::new, "Unknown %s constructor %s", t, result); - final ForConstructor metaCtor = new Meta.ForConstructor<>(dc); - constraints(metaCtor, ctor.getReturnValue().getConstraint()); - containerElements(metaCtor, ctor.getReturnValue().getContainerElementType()); - + Optional.of(ctor).map(ConstructorType::getReturnValue).ifPresent(rv -> { + final ForConstructor metaCtor = new Meta.ForConstructor<>(dc); + constraints(metaCtor, rv.getConstraint()); + containerElements(metaCtor, rv.getContainerElementType()); + }); final Parameter[] params = dc.getParameters(); IntStream.range(0, parameterTypes.length).forEach(n -> {