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 01:29:21 UTC
svn commit: r673546 - in /ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler: BpelCompiler.java CommonCompilationMessages.java

Author: mriou
Date: Wed Jul  2 16:29:21 2008
New Revision: 673546

URL: http://svn.apache.org/viewvc?rev=673546&view=rev
Log:
Trying to do better than 'null-argument' as an error message.

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=673546&r1=673545&r2=673546&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 Wed Jul  2 16:29:21 2008
@@ -1194,6 +1194,7 @@
         if (onAlarm.getRepeatEvery() != null)
             oalarm.repeatExpr = compileExpr(onAlarm.getRepeatEvery());
 
+        if (onAlarm.getActivity() == null) throw new CompilationException(__cmsgs.errInvalidAlarm().setSource(onAlarm));
         oalarm.activity = compile(onAlarm.getActivity());
 
         // Check links crossing restrictions.
@@ -1286,6 +1287,7 @@
 
                 }
 
+                if (onEvent.getActivity() == null) throw new CompilationException(__cmsgs.errInvalidAlarm().setSource(onEvent));
                 oevent.activity = compile(onEvent.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=673546&r1=673545&r2=673546&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 Wed Jul  2 16:29:21 2008
@@ -363,7 +363,13 @@
     /** Invalid alarm handler (check for/until/repeatEvery). */
     public CompilationMessage errInvalidAlarm() {
         return this
-            .formatCompilationMessage("Invalid alarm handler (check for/until/repeatEvery).");
+            .formatCompilationMessage("Invalid alarm handler (check for/until/repeatEvery or child activity).");
+    }
+
+    /** Invalid alarm handler (check for/until/repeatEvery). */
+    public CompilationMessage errInvalidEvent() {
+        return this
+            .formatCompilationMessage("Invalid event handler (no child activity?).");
     }
 
     /** Process WSDL URI is ignored for WS-BPEL 2.0 processes. */