From 46378dadb508320f14737a44c75a832dc5c8120c Mon Sep 17 00:00:00 2001
From: Ruslan Diachenko <rd.ryly@gmail.com>
Date: Fri, 28 Aug 2015 00:22:11 +0100
Subject: [PATCH] Issue #1566: ReturnCount violation fixed for
 IllegalInstantiationCheck

---
 .../coding/IllegalInstantiationCheck.java     | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 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 396be8299..07e87c8fc 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
@@ -226,32 +226,36 @@ public class IllegalInstantiationCheck
      * or null if instantiation of className is OK
      */
     private String getIllegalInstantiation(String className) {
-        if (illegalClasses.contains(className)) {
-            return className;
-        }
-        final int pkgNameLen;
+        String fullClassName = null;
 
-        if (pkgName == null) {
-            pkgNameLen = 0;
+        if (illegalClasses.contains(className)) {
+            fullClassName = className;
         }
         else {
-            pkgNameLen = pkgName.length();
-        }
+            final int pkgNameLen;
 
-        for (String illegal : illegalClasses) {
+            if (pkgName == null) {
+                pkgNameLen = 0;
+            }
+            else {
+                pkgNameLen = pkgName.length();
+            }
 
-            if (isStandardClass(className, illegal)) {
-                return illegal;
-            }
-            if (isSamePackage(className, pkgNameLen, illegal)) {
-                return illegal;
-            }
-            final String importArg = checkImportStatements(className);
-            if (importArg != null) {
-                return importArg;
+            for (String illegal : illegalClasses) {
+                if (isStandardClass(className, illegal)
+                        || isSamePackage(className, pkgNameLen, illegal)) {
+                    fullClassName = illegal;
+                }
+                else {
+                    fullClassName = checkImportStatements(className);
+                }
+
+                if (fullClassName != null) {
+                    break;
+                }
             }
         }
-        return null;
+        return fullClassName;
     }
 
     /**