summaryrefslogtreecommitdiffstats
path: root/java/sca/modules/deployment/src
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-10-22 15:16:38 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-10-22 15:16:38 +0000
commit76b3a4b78fce4be4804c6958197abb6e34267e7b (patch)
tree7d1ff57ba08d23daf31629420110feaeaeab1ba7 /java/sca/modules/deployment/src
parent52e64b4f23ce37410adbc772ef519998f4306089 (diff)
Add missing monitor.popContext() calls
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@828741 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules/deployment/src')
-rw-r--r--java/sca/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/java/sca/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java b/java/sca/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
index 458a581ac0..65958a493c 100644
--- a/java/sca/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
+++ b/java/sca/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
@@ -386,8 +386,12 @@ public class DeployerImpl implements Deployer {
Object model = artifact.getModel();
// FIXME: Should we check the artifact URI is META-INF/definitions.xml?
if (model instanceof Definitions) {
- monitor.pushContext("Definitions: " + artifact.getLocation());
- DefinitionsUtil.aggregate((Definitions)model, systemDefinitions, monitor);
+ try {
+ monitor.pushContext("Definitions: " + artifact.getLocation());
+ DefinitionsUtil.aggregate((Definitions)model, systemDefinitions, monitor);
+ } finally {
+ monitor.popContext();
+ }
}
}