v0.2.54..v0.2.55 changeset MatchGraph.cpp

diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/matching/MatchGraph.cpp b/hoot-core/src/main/cpp/hoot/core/conflate/matching/MatchGraph.cpp
index 9a06875..f66c9bf 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/matching/MatchGraph.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/matching/MatchGraph.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2015, 2016, 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2015, 2016, 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 #include "MatchGraph.h"
 
@@ -184,6 +184,8 @@ public:
 
     DisjointSetMap<ElementId>::AllGroups ag = dsm.getAllGroups();
 
+    const QHash<QString, ConstMatchPtr> idIndexedMatches = Match::getIdIndexedMatches(_matches);
+
     result.reserve(ag.size());
     for (DisjointSetMap<ElementId>::AllGroups::const_iterator it = ag.begin(); it != ag.end(); ++it)
     {
@@ -206,7 +208,8 @@ public:
           ConstMatchPtr m2 = *jt;
           if (m1 != m2)
           {
-            if (checkForConflicts && MergerFactory::getInstance().isConflicting(map, m1, m2))
+            if (checkForConflicts &&
+                MergerFactory::getInstance().isConflicting(map, m1, m2, idIndexedMatches))
             {
               LOG_INFO(m1->toString());
               LOG_INFO(m2->toString());