svn commit: r1173616 - in /tuscany/sca-java-2.x/trunk/modules: deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java

[slaws]

Author: slaws
Date: Wed Sep 21 13:14:57 2011
New Revision: 1173616

URL: http://svn.apache.org/viewvc?rev=1173616&view=rev
Log:
Don't do the build time binding if errors have been reported during the build 
steps

Modified:
    
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
    
tuscany/sca-java-2.x/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java?rev=1173616&r1=1173615&r2=1173616&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
 Wed Sep 21 13:14:57 2011
@@ -600,10 +600,12 @@ public class DeployerImpl implements Dep
         // build the top level composite
         BuilderContext builderContext = new BuilderContext(systemDefinitions, 
bindingMap, monitor);
         compositeBuilder.build(domainComposite, builderContext);
-        // analyzeProblems(monitor);
-   
-        // do build time reference binding
-        buildTimeReferenceBind(domainComposite, builderContext);        
+
+        // only do the local build if we know no errors have been detected   
+        if (!monitor.isErrorDetected()) {
+            // do build time reference binding
+            buildTimeReferenceBind(domainComposite, builderContext);     
+        }
 
         return domainComposite;
     }

Modified: 
tuscany/sca-java-2.x/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java?rev=1173616&r1=1173615&r2=1173616&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
 Wed Sep 21 13:14:57 2011
@@ -361,4 +361,18 @@ public abstract class Monitor {
             reset();
         }
     }
+    
+    public boolean isErrorDetected() {
+        
+        boolean errorDetected = false;
+        
+        for (Problem problem : getProblems()) {
+            if ((problem.getSeverity() == Severity.ERROR)) {
+                errorDetected = true;
+                break;
+            }
+        }
+        
+        return errorDetected;
+    }
 }