From 2fb525fc56a6c3425e57f0abdd95e5c5af5d2fff Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@gmail.com>
Date: Thu, 18 Apr 2013 17:45:07 +0200
Subject: [PATCH] SONAR-3755 Fix issue when tracking issues

---
 .../plugins/core/issue/IssueTracking.java     | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTracking.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTracking.java
index fffa9323ccb..da62686b1a6 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTracking.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTracking.java
@@ -232,19 +232,6 @@ public class IssueTracking implements BatchExtension {
     }
   }
 
-  @VisibleForTesting
-  IssueDto getReferenceIssue(DefaultIssue issue) {
-    return referenceIssuesMap.get(issue);
-  }
-
-  private Integer getRule(DefaultIssue issue) {
-    return ruleFinder.findByKey(issue.ruleKey()).getId();
-  }
-
-  private Integer getRule(IssueDto issue) {
-    return ruleFinder.findById(issue.getRuleId()).getId();
-  }
-
   private void map(Collection<DefaultIssue> newIssues, Collection<IssueDto> lastIssues, Multimap<Integer, IssueDto> lastIssuesByRule) {
     for (DefaultIssue newIssue : newIssues) {
       if (isNotAlreadyMapped(newIssue)) {
@@ -324,7 +311,7 @@ public class IssueTracking implements BatchExtension {
   }
 
   private boolean isNotAlreadyMapped(IssueDto pastIssue) {
-    return !unmappedLastIssues.contains(pastIssue);
+    return unmappedLastIssues.contains(pastIssue);
   }
 
   private boolean isNotAlreadyMapped(DefaultIssue newIssue) {
@@ -370,6 +357,19 @@ public class IssueTracking implements BatchExtension {
     }
   }
 
+  @VisibleForTesting
+  IssueDto getReferenceIssue(DefaultIssue issue) {
+    return referenceIssuesMap.get(issue);
+  }
+
+  private Integer getRule(DefaultIssue issue) {
+    return ruleFinder.findByKey(issue.ruleKey()).getId();
+  }
+
+  private Integer getRule(IssueDto issue) {
+    return issue.getRuleId();
+  }
+
   @Override
   public String toString() {
     return getClass().getSimpleName();
-- 
2.39.5