Fix for issue 4274 (ZIP package control-panel displays both installation path and instance path)
Do the same as is done for the instance path with the install root: try to use File.getCanonicalPath to avoid having relative paths (../..). Since this is done only once when the config file handler is created, there is no performance impact.
| | |
|---|
| | | } |
|---|
| | | else |
|---|
| | | { |
|---|
| | | serverRoot = rootFile.getAbsolutePath(); |
|---|
| | | /* |
|---|
| | | * Do a best effort to avoid having a relative representation (for |
|---|
| | | * instance to avoid having ../../../). |
|---|
| | | */ |
|---|
| | | try |
|---|
| | | { |
|---|
| | | serverRoot = rootFile.getCanonicalPath(); |
|---|
| | | } |
|---|
| | | catch (IOException ioe) |
|---|
| | | { |
|---|
| | | // Best effort |
|---|
| | | serverRoot = rootFile.getAbsolutePath(); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | // Determine the appropriate server root. If it's not defined in the |
|---|
