Skip to content

Commit d4148bf

Browse files
author
Vladimir Kotal
committed
avoid dereferencing null pointer
1 parent be74894 commit d4148bf

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

opengrok-indexer/src/main/java/org/opengrok/indexer/history/SCCSRepository.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,9 @@ String determineParent(boolean interactive) throws IOException {
196196
try (BufferedReader in = new BufferedReader(new FileReader(parentFile))) {
197197
if ((line = in.readLine()) == null) {
198198
LOGGER.log(Level.WARNING,
199-
"Failed to get parent for {0} (cannot read line)",
200-
getDirectoryName());
199+
"Failed to get parent for {0} (cannot read first line of {1})",
200+
new Object[]{getDirectoryName(), parentFile.getName()});
201+
return null;
201202
}
202203
if (!line.startsWith("VERSION")) {
203204
LOGGER.log(Level.WARNING,
@@ -206,8 +207,8 @@ String determineParent(boolean interactive) throws IOException {
206207
}
207208
if ((parent = in.readLine()) == null) {
208209
LOGGER.log(Level.WARNING,
209-
"Failed to get parent for {0} (cannot read second line)",
210-
getDirectoryName());
210+
"Failed to get parent for {0} (cannot read second line of {1})",
211+
new Object[]{getDirectoryName(), parentFile.getName()});
211212
}
212213
}
213214
}

0 commit comments

Comments
 (0)