You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2012/05/09 05:59:02 UTC
svn commit: r1335915 -
/geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationUpdateHelper.java
Author: gawor
Date: Wed May 9 03:59:01 2012
New Revision: 1335915
URL: http://svn.apache.org/viewvc?rev=1335915&view=rev
Log:
update eba first before causing bundle refresh
Modified:
geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationUpdateHelper.java
Modified: geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationUpdateHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationUpdateHelper.java?rev=1335915&r1=1335914&r2=1335915&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationUpdateHelper.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationUpdateHelper.java Wed May 9 03:59:01 2012
@@ -128,12 +128,6 @@ public class ApplicationUpdateHelper {
LOG.info("Update of {} bundle will cause the following bundles to be refreshed: {}", bundleName, bundleListString);
}
- // install listener for package refresh
- RefreshListener refreshListener = new RefreshListener();
-
- // refresh the bundle - this happens asynchronously
- wiring.refreshBundles(bundles, refreshListener);
-
// update application archive
try {
updateEBA(targetBundle, bundleFile);
@@ -141,8 +135,10 @@ public class ApplicationUpdateHelper {
LOG.warn("Error updating application archive with the new contents. " +
"Changes made might be gone next time the application or server is restarted.", e.getMessage());
}
-
- // wait for package refresh to finish
+
+ // refresh the bundle and its dependents
+ RefreshListener refreshListener = new RefreshListener();
+ wiring.refreshBundles(bundles, refreshListener);
refreshListener.waitForRefresh(bundleRefreshTimeout);
// start the bundle