You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2008/07/03 19:18:19 UTC

svn commit: r673740 - in /ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler: BpelCompiler.java CommonCompilationMessages.java

Author: mriou
Date: Thu Jul  3 10:18:19 2008
New Revision: 673740

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

Modified:
    ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
    ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java

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

Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java?rev=673740&r1=673739&r2=673740&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java Thu Jul  3 10:18:19 2008
@@ -481,6 +481,10 @@
 		return this.formatCompilationMessage("Empty sequences 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);
 	}