From 6c7c3c0822919d1dc70fd4a7c162ce3118967625 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky 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 703c128812..5d8ee22932 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 class TypeOneUUIDGenerator { long time; synchronized (lock) { - if (currentTime > lastTime) { + if (currentTime == lastTime) { + ++clockSequence; + } else { lastTime = currentTime; clockSequence = 0; - } else { - ++clockSequence; } }