Repository: karaf Updated Branches: refs/heads/master 35f7c6acd -> e90bf7e82
[KARAF-5109] endorsed and ext directories are not set properly Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/01e12ee5 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/01e12ee5 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/01e12ee5 Branch: refs/heads/master Commit: 01e12ee5d85cfb931f13c5e21e3d046954f5c65e Parents: 35f7c6a Author: FreÌdeÌrik Rouleau <[email protected]> Authored: Thu Apr 27 22:31:40 2017 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Fri Apr 28 10:55:23 2017 +0200 ---------------------------------------------------------------------- .../karaf/instance/core/internal/InstanceServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/01e12ee5/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java ---------------------------------------------------------------------- diff --git a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java index 0d30b19..7779073 100644 --- a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java +++ b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java @@ -481,12 +481,13 @@ public class InstanceServiceImpl implements InstanceService { String location = instance.loc; - File libDir = new File(System.getProperty("karaf.home"), "lib" + File.separator + "boot"); + File libDir = new File(System.getProperty("karaf.home"), "lib"); + File bootLibDir = new File(libDir, "boot"); File childLibDir = new File(location, "lib"); - StringBuilder classpath = classpathFromLibDir(libDir); + StringBuilder classpath = classpathFromLibDir(bootLibDir); StringBuilder childClasspath = classpathFromLibDir(childLibDir); - if (childClasspath.length() > 0 && !libDir.equals(childLibDir)) { + if (childClasspath.length() > 0 && !bootLibDir.equals(childLibDir)) { classpath.append(System.getProperty("path.separator")); classpath.append(childClasspath); }
