From 47bc715da4497864d51de6c0463c76f76dd98606 Mon Sep 17 00:00:00 2001
From: ahind <andy.hind@alfresco.com>
Date: Fri, 4 Aug 2017 22:09:27 +0100
Subject: [PATCH] SEARCH-492    Investigate / fix issues with the test
 framework - only load persisted models if the dictionary is empty

---
 .../main/java/org/alfresco/solr/tracker/ModelTracker.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/alfresco-search/src/main/java/org/alfresco/solr/tracker/ModelTracker.java b/alfresco-search/src/main/java/org/alfresco/solr/tracker/ModelTracker.java
index 29f55f8f4..17314cb29 100644
--- a/alfresco-search/src/main/java/org/alfresco/solr/tracker/ModelTracker.java
+++ b/alfresco-search/src/main/java/org/alfresco/solr/tracker/ModelTracker.java
@@ -128,6 +128,11 @@ public class ModelTracker extends AbstractTracker implements Tracker
      */
     private void loadPersistedModels()
     {
+    	if(AlfrescoSolrDataModel.getInstance().getAlfrescoModels().size() > 0)
+    	{
+    		return;
+    	}
+    	
         HashMap<String, M2Model> modelMap = new HashMap<String, M2Model>();
         if (alfrescoModelDir.exists() && alfrescoModelDir.isDirectory())
         {