From 98a3157200a6b488a0f78b67b0741a2bd72d40fa Mon Sep 17 00:00:00 2001 From: Ruslan Diachenko Date: Wed, 26 Aug 2015 21:57:57 +0100 Subject: [PATCH] Issue #1566: partial fix of ReturnCount violations --- .../checks/coding/IllegalInstantiationCheck.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java index 9a61e2150..4d371ad88 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java @@ -260,6 +260,7 @@ public class IllegalInstantiationCheck * @return value of illegal instatiated type */ private String checkImportStatements(String className) { + String illegalType = null; // import statements for (FullIdent importLineText : imports) { final String importArg = importLineText.getText(); @@ -270,17 +271,19 @@ public class IllegalInstantiationCheck // assume that illegalInsts only contain existing classes // or else we might create a false alarm here if (illegalClasses.contains(fqClass)) { - return fqClass; + illegalType = fqClass; + break; } } else { if (CommonUtils.baseClassname(importArg).equals(className) && illegalClasses.contains(importArg)) { - return importArg; + illegalType = importArg; + break; } } } - return null; + return illegalType; } /**