Skip to content

Commit 496fe06

Browse files
authored
Merge pull request #9003 from lahodaj/no-npe-junit-compact-source-files
Preventing an NPE for compact source files inside test roots.
2 parents e7c7ae5 + eb0ff16 commit 496fe06

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

java/junit.ui/src/org/netbeans/modules/junit/ui/actions/TestClassInfoTask.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,9 @@ private static void collect(CompilationInfo info, TreePath clazz, List<TreePath>
127127
Trees trees = info.getTrees();
128128
Elements elements = info.getElements();
129129
TreeUtilities treeUtilities = info.getTreeUtilities();
130-
int clazzPreferred = treeUtilities.findNameSpan((ClassTree) clazz.getLeaf())[0];
130+
int[] classNameSpan = treeUtilities.findNameSpan((ClassTree) clazz.getLeaf());
131+
int clazzPreferred = classNameSpan != null ? classNameSpan[0]
132+
: (int) trees.getSourcePositions().getStartPosition(clazz.getCompilationUnit(), clazz.getLeaf());
131133
TypeElement typeElement = (TypeElement) trees.getElement(clazz);
132134
TypeElement testcase = elements.getTypeElement(TESTCASE);
133135
NestedClass nc = getNestedClass(info, typeElement);

0 commit comments

Comments
 (0)