You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gg...@apache.org on 2017/12/08 08:56:19 UTC
[karaf] branch master updated: Revert "[KARAF-5528] Stop refreshed
bundles together with updated and deleted ones"
This is an automated email from the ASF dual-hosted git repository.
ggrzybek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 2da30f9 Revert "[KARAF-5528] Stop refreshed bundles together with updated and deleted ones"
2da30f9 is described below
commit 2da30f975f1403a324d43db219ccc2dd585a2956
Author: Grzegorz Grzybek <gr...@gmail.com>
AuthorDate: Fri Dec 8 09:56:09 2017 +0100
Revert "[KARAF-5528] Stop refreshed bundles together with updated and deleted ones"
This reverts commit ee2b0933fdb5a0c86ac183d38d99025e32569678.
---
.../java/org/apache/karaf/features/internal/service/Deployer.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
index 90e2ce9..48eed92 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
@@ -559,7 +559,7 @@ public class Deployer {
//
// Execute deployment
//
- // #1: stop bundles that needs to be updated or uninstalled or refreshed in order
+ // #1: stop bundles that needs to be updated or uninstalled in order
// #2: uninstall needed bundles
// #3: update regions
// #4: update bundles
@@ -633,9 +633,6 @@ public class Deployer {
toStop.addAll(regionDeployment.toUpdate.keySet());
toStop.addAll(regionDeployment.toDelete);
}
- Set<Bundle> toRefreshToStopEarly = new HashSet<>(toRefresh.keySet());
- toRefreshToStopEarly.remove(dstate.serviceBundle);
- toStop.addAll(toRefreshToStopEarly);
removeFragmentsAndBundlesInState(toStop, UNINSTALLED | RESOLVED | STOPPING | STARTING);
if (!toStop.isEmpty()) {
print("Stopping bundles:", verbose);
--
To stop receiving notification emails like this one, please contact
['"commits@karaf.apache.org" <co...@karaf.apache.org>'].