From b735d6aa7d7450a2d88d444aab73471f3908acd2 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <oleg@suitcase.io>
Date: Tue, 19 Jul 2016 15:13:36 -0400
Subject: [PATCH] NIFI-826 (part 3) - fixed ID generation routine that was
 causing miss-identification of the components

---
 .../java/org/apache/nifi/util/TypeOneUUIDGenerator.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/TypeOneUUIDGenerator.java b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/TypeOneUUIDGenerator.java
index 703c128812ab..5d8ee22932ff 100644
--- a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/TypeOneUUIDGenerator.java
+++ b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/TypeOneUUIDGenerator.java
@@ -49,11 +49,11 @@ public final static UUID generateId(long currentTime, int lsbInt) {
         long time;
 
         synchronized (lock) {
-            if (currentTime > lastTime) {
+            if (currentTime == lastTime) {
+                ++clockSequence;
+            } else {
                 lastTime = currentTime;
                 clockSequence = 0;
-            } else {
-                ++clockSequence;
             }
         }