GRP-1388: timer issue in psp

Internet2 · Oct 18, 2016 · b83876f · b83876f
1 parent abde53e
commit b83876f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...er-changelog/src/main/java/edu/internet2/middleware/psp/grouper/PspChangeLogConsumer.java b/...er-changelog/src/main/java/edu/internet2/middleware/psp/grouper/PspChangeLogConsumer.java
@@ -470,7 +470,7 @@ public long processChangeLogEntries(final List<ChangeLogEntry> changeLogEntryLis
         String lastContextId = null;
 
         LOG.debug("PSP Consumer '{}' - Processing change log entry list size '{}'", name, changeLogEntryList.size());
-
+        boolean first = true;
         // process each change log entry
         for (ChangeLogEntry changeLogEntry : changeLogEntryList) {
 
@@ -485,7 +485,8 @@ public long processChangeLogEntries(final List<ChangeLogEntry> changeLogEntryLis
             }
 
             // if first run, start the stop watch and store the last sequence number
-            if (lastContextId == null) {
+            if (first) {
+                first = false;
                 stopWatch.start();
                 lastContextId = changeLogEntry.getContextId();
             }
@@ -508,7 +509,7 @@ public long processChangeLogEntries(final List<ChangeLogEntry> changeLogEntryLis
             }
 
             // if the change log context id has changed, log and restart stop watch
-            if (!StringUtils.equals(lastContextId, changeLogEntry.getContextId())) {
+            if (lastContextId == null || changeLogEntry.getContextId() == null || !StringUtils.equals(lastContextId, changeLogEntry.getContextId())) {
                 stopWatch.stop();
                 LOG.debug("PSP Consumer '{}' - Processed change log context '{}' Elapsed time {}", new Object[] {name,
                         lastContextId, stopWatch,});