Skip to content

Commit 3f60f67

Browse files
committed
CLDR-17829 web tests hit a NPE
1 parent d91b1b9 commit 3f60f67

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

tools/cldr-code/src/main/java/org/unicode/cldr/util/PathDescription.java

+11-2
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,22 @@ public enum Status {
106106

107107
public String getRawDescription(String path, Object context) {
108108
status.clear();
109-
return pathHandling.get(path, context, pathArguments).getSecond();
109+
final Pair<String, String> entry = pathHandling.get(path, context, pathArguments);
110+
if (entry == null) {
111+
return null;
112+
}
113+
return entry.getSecond();
110114
}
111115

112116
public String getRawDescription(
113117
String path, Object context, Output<Finder> matcherFound, Set<String> failures) {
114118
status.clear();
115-
return pathHandling.get(path, context, pathArguments, matcherFound, failures).getSecond();
119+
final Pair<String, String> entry =
120+
pathHandling.get(path, context, pathArguments, matcherFound, failures);
121+
if (entry == null) {
122+
return null;
123+
}
124+
return entry.getSecond();
116125
}
117126

118127
public String getDescription(String path, String value, Object context) {

0 commit comments

Comments
 (0)