diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java b/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java index e03ad64cd..dad1b5cd0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java @@ -122,7 +122,7 @@ public class Opt { try { return Opt.ofNullable(supplier.call()); } catch (Exception e) { - final Opt empty = Opt.empty(); + final Opt empty = new Opt<>(null); empty.exception = e; return empty; } diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java index 0bdab907d..41d2d19c3 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java @@ -187,6 +187,21 @@ public class OptTest { Assert.assertEquals(indexOut, indexOutSituation); Assert.assertEquals("hutool", npe); Assert.assertEquals("hutool", indexOut); + + // 多线程下情况测试 + Stream.iterate(0, i -> ++i).limit(20000).parallel().forEach(i -> { + Opt opt = Opt.ofTry(() -> { + if (i % 2 == 0) { + throw new IllegalStateException(i + ""); + } else { + throw new NullPointerException(i + ""); + } + }); + Assert.assertTrue( + (i % 2 == 0 && opt.getException() instanceof IllegalStateException) || + (i % 2 != 0 && opt.getException() instanceof NullPointerException) + ); + }); } @Data