Skip to content

Commit 49ef723

Browse files
author
Vladimir Kotal
authored
parent member should not shadow parent class field (#2267)
1 parent 46414f5 commit 49ef723

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ public class AccuRevRepository extends Repository {
9090
private static final RuntimeEnvironment env = RuntimeEnvironment.getInstance();
9191

9292
private String depotName = null;
93-
private String parent = null;
93+
private String parentInfo = null;
9494
private String wsRoot = null;
9595
private String relRoot = "";
9696

97-
/**
97+
/**
9898
* This will be /./ on Unix and \.\ on Windows
9999
*/
100100
private static final String depotRoot
@@ -317,7 +317,7 @@ private boolean getAccuRevInfo(File wsPath, boolean interactive) {
317317
else if (line.startsWith("Basis")) {
318318
Matcher parentMatch = PARENT_PATTERN.matcher(line);
319319
if (parentMatch.find()) {
320-
parent = parentMatch.group(1);
320+
parentInfo = parentMatch.group(1);
321321
}
322322
}
323323

@@ -480,7 +480,7 @@ History getHistory(File file) throws HistoryException {
480480
@Override
481481
String determineParent(boolean interactive) throws IOException {
482482
getAccuRevInfo(new File(getDirectoryName()), interactive);
483-
return parent;
483+
return parentInfo;
484484
}
485485

486486
@Override

0 commit comments

Comments
 (0)