Return-Path: <commits-return-3674-archive-asf-public=cust-asf.ponee.io@groovy.apache.org>
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 8C19E200D0F
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Fri, 29 Sep 2017 14:50:36 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 8A8121609ED; Fri, 29 Sep 2017 12:50:36 +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 D16161609D1
	for <archive-asf-public@cust-asf.ponee.io>; Fri, 29 Sep 2017 14:50:35 +0200 (CEST)
Received: (qmail 11641 invoked by uid 500); 29 Sep 2017 12:50:35 -0000
Mailing-List: contact commits-help@groovy.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@groovy.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@groovy.apache.org>
List-Post: <mailto:commits@groovy.apache.org>
List-Id: <commits.groovy.apache.org>
Reply-To: dev@groovy.apache.org
Delivered-To: mailing list commits@groovy.apache.org
Received: (qmail 11632 invoked by uid 99); 29 Sep 2017 12:50:35 -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; Fri, 29 Sep 2017 12:50:35 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id C7939E967F; Fri, 29 Sep 2017 12:50:32 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: paulk@apache.org
To: commits@groovy.apache.org
Date: Fri, 29 Sep 2017 12:50:33 -0000
Message-Id: <ae46d0c87e884f82b1f4989392e30240@git.apache.org>
In-Reply-To: <2f579b4cad56416eb8bde7d5e912845b@git.apache.org>
References: <2f579b4cad56416eb8bde7d5e912845b@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/2] groovy git commit: minor refactor
archived-at: Fri, 29 Sep 2017 12:50:36 -0000

minor refactor


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/4888769d
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/4888769d
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/4888769d

Branch: refs/heads/GROOVY_2_5_X
Commit: 4888769de12d760e644c58a79417534fc2362b6f
Parents: f56a9b5
Author: paulk <paulk@asert.com.au>
Authored: Wed Sep 27 22:01:49 2017 +1000
Committer: paulk <paulk@asert.com.au>
Committed: Fri Sep 29 22:50:15 2017 +1000

----------------------------------------------------------------------
 .../codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/4888769d/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index aed8f01..f410f71 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -1992,7 +1992,7 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
             List<ClassNode> classNodes = getTemporaryTypesForExpression(exp);
             if (classNodes != null && !classNodes.isEmpty()) {
                 ArrayList<ClassNode> arr = new ArrayList<ClassNode>(classNodes.size() + 1);
-                if (result != null) arr.add(result);
+                if (result != null && !classNodes.contains(result)) arr.add(result);
                 arr.addAll(classNodes);
                 // GROOVY-7333: filter out Object
                 Iterator<ClassNode> iterator = arr.iterator();