浏览代码

Merge pull request #874 from jptx1234/v5-dev

[bug修复] Snowflake 循环等待下一个时间时避免长时间循环,加入对时钟倒退的判断
Golden Looly 5 年之前
父节点
当前提交
bfab76bcb9
共有 1 个文件被更改,包括 7 次插入1 次删除
  1. 7 1
      hutool-core/src/main/java/cn/hutool/core/lang/Snowflake.java

+ 7 - 1
hutool-core/src/main/java/cn/hutool/core/lang/Snowflake.java

@@ -177,9 +177,15 @@ public class Snowflake implements Serializable {
 	 */
 	private long tilNextMillis(long lastTimestamp) {
 		long timestamp = genTime();
-		while (timestamp <= lastTimestamp) {
+		// 循环直到操作系统时间戳变化
+		while (timestamp == lastTimestamp) {
 			timestamp = genTime();
 		}
+		if (timestamp < lastTimestamp) {
+			// 如果发现新的时间戳比上次记录的时间戳数值小,说明操作系统时间发生了倒退,报错
+			throw new IllegalStateException(
+					StrUtil.format("Clock moved backwards. Refusing to generate id for {}ms", lastTimestamp - timestamp));
+		}
 		return timestamp;
 	}