From 31ef2b0df7da3f061991d7bc375665402c762e9d Mon Sep 17 00:00:00 2001 From: John Emmons Date: Wed, 23 Sep 2015 19:50:53 +0000 Subject: [PATCH] ICU-11928 Fix NPEs in test framework (affects CLDR build) X-SVN-Rev: 38011 --- .../tests/framework/src/com/ibm/icu/dev/test/TestFmwk.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/icu4j/main/tests/framework/src/com/ibm/icu/dev/test/TestFmwk.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/test/TestFmwk.java index bf9021eff2b..ff7d3629f0f 100644 --- a/icu4j/main/tests/framework/src/com/ibm/icu/dev/test/TestFmwk.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/test/TestFmwk.java @@ -1974,9 +1974,10 @@ public class TestFmwk extends AbstractTestLog { // Walk up the stack to the first call site outside this file for (StackTraceElement st : new Throwable().getStackTrace()) { String source = st.getFileName(); - if (!source.equals("TestFmwk.java") && !source.equals("AbstractTestLog.java")) { + if (source != null && !source.equals("TestFmwk.java") && !source.equals("AbstractTestLog.java")) { String methodName = st.getMethodName(); - if (methodName.startsWith("Test") || methodName.startsWith("test") || methodName.equals("main")) { + if (methodName != null && + (methodName.startsWith("Test") || methodName.startsWith("test") || methodName.equals("main"))) { return "(" + source + ":" + st.getLineNumber() + ") "; } } -- 2.40.0