From e838179bb2c20efb19acbeef668d192b66bd6bdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Mart=C3=ADn=20Sotuyo=20Dodero?=
 <juansotuyo@gmail.com>
Date: Sun, 15 Apr 2018 01:44:02 -0300
Subject: [PATCH] Fix PMD dogfooding

---
 .../net/sourceforge/pmd/cpd/token/JavaCCTokenFilter.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/JavaCCTokenFilter.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/JavaCCTokenFilter.java
index 0fb4a41a52..0b1cd53b4e 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/JavaCCTokenFilter.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/JavaCCTokenFilter.java
@@ -31,12 +31,11 @@ public class JavaCCTokenFilter implements TokenFilter {
             analyzeToken(currentToken);
             processCPDSuppression(currentToken);
 
-            if (isDiscarding()) {
-                currentToken = (GenericToken) tokenManager.getNextToken();
-                continue;
+            if (!isDiscarding()) {
+                return currentToken;
             }
 
-            return currentToken;
+            currentToken = (GenericToken) tokenManager.getNextToken();
         }
         
         return null;