You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by gk...@apache.org on 2019/10/28 15:26:54 UTC
svn commit: r1869078 -
/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/TorqueComponent.java
Author: gk
Date: Mon Oct 28 15:26:53 2019
New Revision: 1869078
URL: http://svn.apache.org/viewvc?rev=1869078&view=rev
Log:
- use more robust path resolver
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/TorqueComponent.java
Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/TorqueComponent.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/TorqueComponent.java?rev=1869078&r1=1869077&r2=1869078&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/TorqueComponent.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/TorqueComponent.java Mon Oct 28 15:26:53 2019
@@ -20,6 +20,8 @@ package org.apache.torque.avalon;
*/
import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.Map;
import org.apache.avalon.framework.activity.Disposable;
@@ -111,12 +113,10 @@ ThreadSafe
+ configurationFile);
}
- StringBuilder sb = new StringBuilder();
- sb.append(appRoot);
- sb.append(File.separator);
- sb.append(configurationFile);
-
- configurationFile = sb.toString();
+ Path configurationPath = new File(appRoot).toPath().resolve(configurationFile).normalize();
+ getLogger().debug("Config Path normalized to "
+ + configurationPath);
+ configurationFile = configurationPath.toString();
}
getLogger().debug("Config File is " + configurationFile);
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org