Author: rmannibucau
Date: Sun Aug 24 15:54:45 2014
New Revision: 1620145
URL: http://svn.apache.org/r1620145
Log:
making SystemInstance really optional in ProvisioningResolver - once resolver
configured
Modified:
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/ProvisioningResolver.java
Modified:
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/ProvisioningResolver.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/ProvisioningResolver.java?rev=1620145&r1=1620144&r2=1620145&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/ProvisioningResolver.java
(original)
+++
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/ProvisioningResolver.java
Sun Aug 24 15:54:45 2014
@@ -175,7 +175,11 @@ public class ProvisioningResolver {
}
public static File cacheFile(final String path) {
- return new File(SystemInstance.get().getBase().getDirectory(), cache()
+ File.separator + path);
+ final String cache = cache();
+ if (new File(cache).isAbsolute()) {
+ return new File(cache, path);
+ }
+ return new File(SystemInstance.get().getBase().getDirectory(), cache +
File.separator + path);
}
@Override
