karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [1/2] karaf git commit: [KARAF-5109] endorsed and ext directories are not set properly
Date Fri, 28 Apr 2017 08:55:07 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x d0707ac4e -> 86d79c81c


[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/e4d82c29
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e4d82c29
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e4d82c29

Branch: refs/heads/karaf-4.0.x
Commit: e4d82c2967ff187c694d9ca2379cafbf1d1ed424
Parents: d0707ac
Author: Frédérik Rouleau <frouleau@gmail.com>
Authored: Thu Apr 27 22:31:40 2017 +0200
Committer: Frédérik Rouleau <frouleau@gmail.com>
Committed: Thu Apr 27 22:31:40 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/e4d82c29/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 f8ec6d8..29c0d4b 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
@@ -493,12 +493,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);
         }


Mime
View raw message