From commits-return-8250-archive-asf-public=cust-asf.ponee.io@groovy.apache.org Tue Apr 9 23:55:55 2019 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 [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 17BA8180629 for ; Wed, 10 Apr 2019 01:55:54 +0200 (CEST) Received: (qmail 60137 invoked by uid 500); 9 Apr 2019 23:36:16 -0000 Mailing-List: contact commits-help@groovy.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@groovy.apache.org Delivered-To: mailing list commits@groovy.apache.org Received: (qmail 60128 invoked by uid 99); 9 Apr 2019 23:36:16 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Apr 2019 23:36:16 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 3245B80B36; Tue, 9 Apr 2019 23:55:54 +0000 (UTC) Date: Tue, 09 Apr 2019 23:55:54 +0000 To: "commits@groovy.apache.org" Subject: [groovy] branch master updated: GROOVY-9008: minor refactor: better error processing when method not found MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155485415400.19304.10152303876191500576@gitbox.apache.org> From: paulk@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: groovy X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 1029030bfe3afbcd89bba6642192eba2e9c5c3b4 X-Git-Newrev: 3e518c475deba6874b9b9f4f7d5dcf3639d4faad X-Git-Rev: 3e518c475deba6874b9b9f4f7d5dcf3639d4faad X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git The following commit(s) were added to refs/heads/master by this push: new 3e518c4 GROOVY-9008: minor refactor: better error processing when method not found 3e518c4 is described below commit 3e518c475deba6874b9b9f4f7d5dcf3639d4faad Author: Paul King AuthorDate: Wed Apr 10 09:55:19 2019 +1000 GROOVY-9008: minor refactor: better error processing when method not found --- .../classgen/asm/sc/StaticTypesMethodReferenceExpressionWriter.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesMethodReferenceExpressionWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesMethodReferenceExpressionWriter.java index 0f05cb0..98cb1d4 100644 --- a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesMethodReferenceExpressionWriter.java +++ b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesMethodReferenceExpressionWriter.java @@ -20,6 +20,7 @@ package org.codehaus.groovy.classgen.asm.sc; import groovy.lang.GroovyRuntimeException; import groovy.lang.Tuple; +import groovy.lang.Tuple2; import org.codehaus.groovy.ast.ClassHelper; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.MethodNode; @@ -268,9 +269,7 @@ public class StaticTypesMethodReferenceExpressionWriter extends MethodReferenceE return mrMethodNodeList.stream() .map(e -> Tuple.tuple(e, matchingScore(e, mrExpr))) - .min((t1, t2) -> Integer.compare(t2.getV2(), t1.getV2())) - .get() - .getV1(); + .min((t1, t2) -> Integer.compare(t2.getV2(), t1.getV2())).map(Tuple2::getV1).orElse(null); } private static Integer matchingScore(MethodNode mn, Expression mrExpr) {