svn commit: r673741 - in /ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler: BpelCompiler.java CommonCompilationMessages.java

[mriou]

Author: mriou
Date: Thu Jul  3 10:21:38 2008
New Revision: 673741

URL: http://svn.apache.org/viewvc?rev=673741&view=rev
Log:
One more checked compilation error, instead of the now infamous null-argument.

Modified:
    
ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
    
ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java

Modified: 
ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java?rev=673741&r1=673740&r2=673741&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
 Thu Jul  3 10:21:38 2008
@@ -1489,6 +1489,8 @@
                                 ctch.faultVariable = faultVar;
                             }
 
+                            if (catchSrc.getActivity() == null)
+                                throw new 
CompilationException(__cmsgs.errEmptyCatch().setSource(catchSrc));
                             _structureStack.topScope().activity = 
compile(catchSrc.getActivity());
                         }
                     });

Modified: 
ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java?rev=673741&r1=673740&r2=673741&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java
 Thu Jul  3 10:21:38 2008
@@ -473,6 +473,10 @@
         return this.formatCompilationMessage("Empty scopes are forbidden.");
     }
 
+       public CompilationMessage errEmptyCatch() {
+               return this.formatCompilationMessage("Empty catch faut handlers 
are forbidden.");
+       }
+
        public CompilationMessage errMustSpecifyRelatedVariable(String name) {
                return this.formatCompilationMessage("The external variable 
declaration for \"{0}\" must specify a related variable.", name);
        }