Merge remote-tracking branch 'origin/master'

tech-team · Dec 19, 2014 · 2e18855 · 2e18855
2 parents 3483eea + 5444684
commit 2e18855
Showing 1 changed file with 18 additions and 19 deletions.
diff --git a/src/main/java/content/ContentProvider.java b/src/main/java/content/ContentProvider.java
@@ -58,11 +58,7 @@ public void request(PersonCard request, boolean autoMerge) throws InterruptedExc
             fullList.addAll(sources.get(cs).getPersons());
         }
 
-        if (autoMerge) {
-            logger.info("Started auto merge");
-            automaticMerge();
-            logger.info("Finished auto merge");
-        }
+        automaticMerge(autoMerge);
 
         frontend.onFinishedListsRetrieval();
     }
@@ -117,30 +113,33 @@ private MergedPersonCard findCard(Collection<MergedPersonCard> collection, Perso
     }
 
 
-    private void automaticMerge() {
+    private void automaticMerge(boolean doAutoMerge) {
 
         for (Map.Entry<PersonId, PersonCard> entry : fullList.getPersons().entrySet()) {
             PersonCard card = entry.getValue();
             linkList.put(card.getPersonLink(), new MergedPersonCard(card));
         }
 
-        for (Map.Entry<SocialLink, MergedPersonCard> entry : linkList.entrySet()) {
-            SocialLink link = entry.getKey();
-            MergedPersonCard card = entry.getValue();
-
-            Collection<SocialLink> links = card.get(link.getLinkType()).getSocialLinks().values();
-
-            for (SocialLink link1 : links) {
-                MergedPersonCard card1 = linkList.get(link1);
-                if (card1 != null) {
-                    card.add(card1);
-                    linkList.remove(link1);
-                    linkList.put(link1, card);
+        if (doAutoMerge) {
+            logger.info("Started auto merge");
+            for (Map.Entry<SocialLink, MergedPersonCard> entry : linkList.entrySet()) {
+                SocialLink link = entry.getKey();
+                MergedPersonCard card = entry.getValue();
+
+                Collection<SocialLink> links = card.get(link.getLinkType()).getSocialLinks().values();
+
+                for (SocialLink link1 : links) {
+                    MergedPersonCard card1 = linkList.get(link1);
+                    if (card1 != null) {
+                        card.add(card1);
+                        linkList.remove(link1);
+                        linkList.put(link1, card);
+                    }
                 }
             }
+            logger.info("Finished auto merge");
         }
 
-
         for (Map.Entry<SocialLink, MergedPersonCard> entry : linkList.entrySet()) {
             MergedPersonCard card = entry.getValue();
             if (!mergedList.contains(card)) {