From adebc9da6f1c59de41426400149d2da0339e797e Mon Sep 17 00:00:00 2001
From: Ruslan Diachenko <rd.ryly@gmail.com>
Date: Wed, 26 Aug 2015 22:22:11 +0100
Subject: [PATCH] Issue #1566: partial fix of ReturnCount violations

---
 .../checks/imports/AvoidStaticImportCheck.java         | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java
index 0038915bf..c44f76d29 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java
@@ -119,9 +119,12 @@ public class AvoidStaticImportCheck
      * @return true if except false if not
      */
     private boolean isExempt(String classOrStaticMember) {
+        boolean exempt = false;
+
         for (String exclude : excludes) {
             if (classOrStaticMember.equals(exclude)) {
-                return true;
+                exempt = true;
+                break;
             }
             else if (exclude.endsWith(".*")) {
                 //this section allows explicit imports
@@ -136,11 +139,12 @@ public class AvoidStaticImportCheck
                             excludeMinusDotStar.length() + 1);
                     //if it contains a dot then it is not a member but a package
                     if (member.indexOf('.') == -1) {
-                        return true;
+                        exempt = true;
+                        break;
                     }
                 }
             }
         }
-        return false;
+        return exempt;
     }
 }