From 4ef2befdcbad7cec91286a9bd2d1911dbd54fabf Mon Sep 17 00:00:00 2001
From: Angel Borroy <angel.borroy@alfresco.com>
Date: Wed, 28 Aug 2019 16:34:32 +0200
Subject: [PATCH] Fixes from review comments.

---
 .../src/main/java/org/alfresco/solr/SolrInformationServer.java  | 2 +-
 .../src/main/java/org/alfresco/solr/TrackerState.java           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
index 838604cef..d4d81df1f 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
@@ -2124,7 +2124,7 @@ public class SolrInformationServer implements InformationServer
             newDoc.addField(FIELD_PROPERTIES, propertyQName.toString());
             newDoc.addField(FIELD_PROPERTIES, propertyQName.getPrefixString());
             
-            PropertyValue value = properties.get(propertyQName);
+            PropertyValue value = property.getValue();
             if(value != null)
             {
                 if (value instanceof StringPropertyValue)
diff --git a/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/TrackerState.java b/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/TrackerState.java
index 2859723d4..8c36b99bc 100644
--- a/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/TrackerState.java
+++ b/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/TrackerState.java
@@ -68,7 +68,7 @@ public class TrackerState
 
     private volatile boolean check = false;
     // Handle Thread Safe operations
-    private volatile AtomicInteger trackerCycles;
+    private volatile AtomicInteger trackerCycles = new AtomicInteger(0);
 
     private long timeToStopIndexing;