Author: rmannibucau
Date: Sun Dec 2 12:19:22 2012
New Revision: 1416163
URL: http://svn.apache.org/viewvc?rev=1416163&view=rev
Log:
if parts[0] is absolute skip dir attribute
Modified:
openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/Files.java
Modified:
openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/Files.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/Files.java?rev=1416163&r1=1416162&r2=1416163&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/Files.java
(original)
+++
openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/Files.java
Sun Dec 2 12:19:22 2012
@@ -43,11 +43,21 @@ public class Files {
}
public static File path(File dir, String... parts) {
- for (String part : parts) {
- dir = new File(dir, part);
+ File base = dir;
+ int idx = 0;
+ if (parts.length >= 1) {
+ final File partFile = new File(parts[0]);
+ if (partFile.exists() && partFile.isAbsolute()) {
+ base = partFile;
+ idx = 1;
+ }
+ }
+
+ for (int i = idx; i < parts.length; i++) {
+ base = new File(base, parts[i]);
}
- return dir;
+ return base;
}
public static List<File> collect(final File dir, final String regex) {
