[2/2] karaf git commit: Merge branch 'topic/KARAF-3443' of https://github.com/jutzig/karaf

[jbonofre]

Merge branch 'topic/KARAF-3443' of https://github.com/jutzig/karaf


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/025b6fb4
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/025b6fb4
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/025b6fb4

Branch: refs/heads/master
Commit: 025b6fb4476c21963ba3962a6d621548853359b2
Parents: dc60798 924ffa9
Author: Jean-Baptiste Onofré <jbono...@apache.org>
Authored: Mon Nov 2 20:32:07 2015 +0100
Committer: Jean-Baptiste Onofré <jbono...@apache.org>
Committed: Mon Nov 2 20:32:07 2015 +0100

----------------------------------------------------------------------
 .../karaf/kar/internal/KarServiceImpl.java      | 124 +++++++++++++++++--
 1 file changed, 116 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/025b6fb4/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java
----------------------------------------------------------------------
diff --cc kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java
index 2b7d7d4,be59b39..1b73165
--- a/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java
+++ b/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java
@@@ -66,10 -70,13 +70,13 @@@ public class KarServiceImpl implements 
      private FeaturesService featuresService;
      
      private boolean noAutoRefreshBundles;
+     private List<Kar> unsatisfiedKars;
+     private AtomicBoolean busy;
+     private DelayedDeployerThread delayedDeployerThread;
  
 -    public KarServiceImpl(String karafBase, FeaturesService featuresService) {
 +    public KarServiceImpl(String karafBase, String karafData, FeaturesService 
featuresService) {
          this.base = new File(karafBase);
 -        this.storage = new File(this.base, "data" + File.separator + "kar");
 +        this.storage = new File(new File(karafData), "kar");
          this.featuresService = featuresService;
          this.storage.mkdirs();
          if (!storage.isDirectory()) {