You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cw...@apache.org on 2010/11/11 15:46:43 UTC
svn commit: r1033954 -
/incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextImpl.java
Author: cwilkin
Date: Thu Nov 11 14:46:43 2010
New Revision: 1033954
URL: http://svn.apache.org/viewvc?rev=1033954&view=rev
Log:
ARIES-489 : Remove the state checking for uninstall as it acts as a cleanup method
Modified:
incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextImpl.java
Modified: incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextImpl.java?rev=1033954&r1=1033953&r2=1033954&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextImpl.java (original)
+++ incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextImpl.java Thu Nov 11 14:46:43 2010
@@ -95,20 +95,23 @@ public class ApplicationContextImpl impl
.getApplicationProvisionBundles());
try {
+
installBundles(provisionBundlesToFind, true);
installBundles(useBundlesToFind, true);
installBundles(bundlesToFind, false);
-
+
+ _state = ApplicationState.INSTALLED;
+
LOGGER.debug("Successfully installed application "
+ _application.getApplicationMetadata().getApplicationSymbolicName());
} catch (BundleException e) {
LOGGER.debug(LOG_EXCEPTION, "Failed to install application "
+ _application.getApplicationMetadata().getApplicationSymbolicName());
+
uninstall();
+
throw e;
}
-
- _state = ApplicationState.INSTALLED;
LOGGER.debug(LOG_EXIT, "install");
@@ -119,13 +122,10 @@ public class ApplicationContextImpl impl
* calls will be ignored.
* @return whether the uninstallation is successful
*/
- protected synchronized void uninstall() throws BundleException, IllegalStateException
+ protected synchronized void uninstall() throws BundleException
{
LOGGER.debug(LOG_ENTRY, "uninstall");
- if (_state == ApplicationState.UNINSTALLED)
- throw new IllegalStateException("Appication is in incorrect state " + _state);
-
// Iterate through all of the bundles that were started when this application was started,
// and attempt to stop and uninstall each of them.
for (Iterator<Bundle> bundleIter = _bundles.iterator(); bundleIter.hasNext();) {