You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/07/09 23:46:25 UTC
[12/50] git commit: Wait for OSGi framework to stop before trying to
delete its cache.
Wait for OSGi framework to stop before trying to delete its cache.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/5c9b29f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/5c9b29f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/5c9b29f6
Branch: refs/heads/master
Commit: 5c9b29f6eddb7082b8557765e7e68239579734c2
Parents: a0e6684
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Jul 4 22:15:09 2014 +0300
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jul 9 22:34:43 2014 +0100
----------------------------------------------------------------------
core/src/main/java/brooklyn/management/ha/OsgiManager.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5c9b29f6/core/src/main/java/brooklyn/management/ha/OsgiManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/ha/OsgiManager.java b/core/src/main/java/brooklyn/management/ha/OsgiManager.java
index 1d2a8a0..c4b94d8 100644
--- a/core/src/main/java/brooklyn/management/ha/OsgiManager.java
+++ b/core/src/main/java/brooklyn/management/ha/OsgiManager.java
@@ -65,10 +65,14 @@ public class OsgiManager {
public void stop() {
try {
- if (framework!=null)
+ if (framework!=null) {
framework.stop();
+ framework.waitForStop(0);
+ }
} catch (BundleException e) {
throw Exceptions.propagate(e);
+ } catch (InterruptedException e) {
+ throw Exceptions.propagate(e);
}
osgiTempDir = Os.deleteRecursively(osgiTempDir).asNullOrThrowing();
framework = null;