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 2007/09/07 18:10:34 UTC
svn commit: r573624 - in
/ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler:
BpelCompiler.java CommonCompilationMessages.java
Author: mriou
Date: Fri Sep 7 09:10:34 2007
New Revision: 573624
URL: http://svn.apache.org/viewvc?rev=573624&view=rev
Log:
Nice compiler exception for empty scopes.
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=573624&r1=573623&r2=573624&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 Fri Sep 7 09:10:34 2007
@@ -859,10 +859,14 @@
v.declaringScope = implicitScope;
implicitScope.addLocalVariable(v);
}
- if (source instanceof ScopeActivity)
- implicitScope.activity = compile(((ScopeActivity) source).getChildActivity());
- else
+ if (source instanceof ScopeActivity) {
+ Activity scopeChild = ((ScopeActivity) source).getChildActivity();
+ if (scopeChild == null)
+ throw new CompilationException(__cmsgs.errEmptyScope().setSource(source));
+ implicitScope.activity = compile(scopeChild);
+ } else {
implicitScope.activity = compileActivity(false, source);
+ }
}
});
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=573624&r1=573623&r2=573624&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 Fri Sep 7 09:10:34 2007
@@ -462,4 +462,9 @@
"messageType {1} couldn't be found.", part, message);
}
+ /** Empty scopes are forbidden. */
+ public CompilationMessage errEmptyScope() {
+ return this.formatCompilationMessage("Empty scopes are forbidden.");
+ }
+
}