aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tjwat...@apache.org
Subject svn commit: r1777366 - in /aries/branches/java6support/subsystem: ./ subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Subsystems.java
Date Wed, 04 Jan 2017 19:21:07 GMT
Author: tjwatson
Date: Wed Jan  4 19:21:07 2017
New Revision: 1777366

URL: http://svn.apache.org/viewvc?rev=1777366&view=rev
Log:
Merge ^/aries/trunk/subsystem  r1760019 through r1777365 into java6support branch.

Modified:
    aries/branches/java6support/subsystem/   (props changed)
    aries/branches/java6support/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Subsystems.java

Propchange: aries/branches/java6support/subsystem/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 19:21:07 2017
@@ -1,2 +1,2 @@
 /aries/branches/1.0-prototype/subsystem:1306564-1337594
-/aries/trunk/subsystem:1728111-1760018
+/aries/trunk/subsystem:1728111-1777365

Modified: aries/branches/java6support/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Subsystems.java
URL: http://svn.apache.org/viewvc/aries/branches/java6support/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Subsystems.java?rev=1777366&r1=1777365&r2=1777366&view=diff
==============================================================================
--- aries/branches/java6support/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Subsystems.java
(original)
+++ aries/branches/java6support/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Subsystems.java
Wed Jan  4 19:21:07 2017
@@ -27,12 +27,14 @@ import java.util.Set;
 
 import org.apache.aries.subsystem.core.archive.DeploymentManifest;
 import org.apache.aries.subsystem.core.internal.BundleResourceInstaller.BundleConstituent;
+import org.apache.aries.util.io.IOUtils;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.wiring.BundleRevision;
 import org.osgi.resource.Resource;
 import org.osgi.service.coordinator.Coordination;
 import org.osgi.service.subsystem.Subsystem;
+import org.osgi.service.subsystem.Subsystem.State;
 import org.osgi.service.subsystem.SubsystemException;
 
 public class Subsystems {
@@ -143,8 +145,13 @@ public class Subsystems {
 				try {
 					for (File f : fileList) {
 						BasicSubsystem s = new BasicSubsystem(f);
-						subsystems.add(s);
-						addSubsystem(s);
+						if (State.UNINSTALLED.equals(s.getState())) {
+							// left over cache, delete this
+							IOUtils.deleteRecursive(f);
+						} else {
+							subsystems.add(s);
+							addSubsystem(s);
+						}
 					}
 					root = getSubsystemById(0);
 					SubsystemIdentifier.setLastId(



Mime
View raw message