Changeset 16462 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-05-19T06:36:12+02:00 (5 years ago)

Author:

GerdP

Message:

fix #19259: NPE at org.openstreetmap.josm.tools.ReflectionUtils.findCaller()
revert changes from r16436

File:

• trunk/src/org/openstreetmap/josm/tools/ReflectionUtils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/ReflectionUtils.java

@@ -7 +7 @@
 import java.util.Collection;
 import java.util.function.Function;
-import java.util.stream.IntStream;
 
 import org.openstreetmap.josm.plugins.PluginHandler;
@@ -64 +63 @@
     private static <T extends Object> T findCaller(Function<StackTraceElement, T> getter, Collection<T> exclusions) {
         StackTraceElement[] stack = Thread.currentThread().getStackTrace();
-        return IntStream.range(3, stack.length)
-                .mapToObj(i -> getter.apply(stack[i]))
-                .filter(t -> exclusions == null || !exclusions.contains(t))
-                .findFirst().orElse(null);
+        for (int i = 3; i < stack.length; i++) {
+            T t = getter.apply(stack[i]);
+            if (exclusions == null || !exclusions.contains(t)) {
+                return t;
+            }
+        }
+        return null;
     }
 }