You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2009/03/11 10:00:30 UTC
svn commit: r752411 -
/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ServiceAssemblyInstaller.java
Author: gnodet
Date: Wed Mar 11 09:00:30 2009
New Revision: 752411
URL: http://svn.apache.org/viewvc?rev=752411&view=rev
Log:
Fix possible NPE and catch all errors on SU deployment
Modified:
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ServiceAssemblyInstaller.java
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ServiceAssemblyInstaller.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ServiceAssemblyInstaller.java?rev=752411&r1=752410&r2=752411&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ServiceAssemblyInstaller.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ServiceAssemblyInstaller.java Wed Mar 11 09:00:30 2009
@@ -108,8 +108,10 @@
throw ManagementSupport.failure("undeployServiceAssembly", "ServiceAssembly '" + getName() + "' is not deployed.");
}
// Undeploy SUs
- for (ServiceUnitImpl su : assembly.getServiceUnitsList()) {
- su.undeploy();
+ if (assembly.getServiceUnitsList() != null) {
+ for (ServiceUnitImpl su : assembly.getServiceUnitsList()) {
+ su.undeploy();
+ }
}
// Unregister assembly
deployer.unregisterServiceAssembly(assembly);
@@ -172,9 +174,9 @@
}
// Add it to the list
sus.add(su);
- } catch (Exception e) {
+ } catch (Throwable e) {
LOGGER.error("Error deploying SU " + su.getName(), e);
- failure = e;
+ failure = new Exception("Error deploying SU " + su.getName(), e);
break;
}
}