svn commit: r170171 - in /incubator/agila/trunk/modules/bpel/engine: core/src/java/org/apache/agila/bpel/engine/priv/expression/impl/BPELExpressionProcessorImpl.java deployer/src/java/org/apache/agila/bpel/deployer/priv/PickDeployer.java deployer/src/java/org/apache/agila/bpel/deployer/priv/WaitDeployer.java

[mr...@apache.org]

Author: mriou
Date: Sat May 14 14:49:52 2005
New Revision: 170171

URL: http://svn.apache.org/viewcvs?rev=170171&view=rev
Log:
Bug fix. All time-based expressions where deployed as durations even when they actually where dates (like in <wait until> or <onAlarm until>).

Modified:
    incubator/agila/trunk/modules/bpel/engine/core/src/java/org/apache/agila/bpel/engine/priv/expression/impl/BPELExpressionProcessorImpl.java
    incubator/agila/trunk/modules/bpel/engine/deployer/src/java/org/apache/agila/bpel/deployer/priv/PickDeployer.java
    incubator/agila/trunk/modules/bpel/engine/deployer/src/java/org/apache/agila/bpel/deployer/priv/WaitDeployer.java

Modified: incubator/agila/trunk/modules/bpel/engine/core/src/java/org/apache/agila/bpel/engine/priv/expression/impl/BPELExpressionProcessorImpl.java
URL: http://svn.apache.org/viewcvs/incubator/agila/trunk/modules/bpel/engine/core/src/java/org/apache/agila/bpel/engine/priv/expression/impl/BPELExpressionProcessorImpl.java?rev=170171&r1=170170&r2=170171&view=diff
==============================================================================
--- incubator/agila/trunk/modules/bpel/engine/core/src/java/org/apache/agila/bpel/engine/priv/expression/impl/BPELExpressionProcessorImpl.java (original)
+++ incubator/agila/trunk/modules/bpel/engine/core/src/java/org/apache/agila/bpel/engine/priv/expression/impl/BPELExpressionProcessorImpl.java Sat May 14 14:49:52 2005
@@ -84,6 +84,7 @@
         } catch (XMLSessionException e) {
             throw new XPathEvaluationException(e);
         }
+
         if (dateTimeType.isValid(reducedExpr, null)) {
             return ((Calendar) dateTimeType.createJavaObject(reducedExpr, null)).getTime();
         } else {

Modified: incubator/agila/trunk/modules/bpel/engine/deployer/src/java/org/apache/agila/bpel/deployer/priv/PickDeployer.java
URL: http://svn.apache.org/viewcvs/incubator/agila/trunk/modules/bpel/engine/deployer/src/java/org/apache/agila/bpel/deployer/priv/PickDeployer.java?rev=170171&r1=170170&r2=170171&view=diff
==============================================================================
--- incubator/agila/trunk/modules/bpel/engine/deployer/src/java/org/apache/agila/bpel/deployer/priv/PickDeployer.java (original)
+++ incubator/agila/trunk/modules/bpel/engine/deployer/src/java/org/apache/agila/bpel/deployer/priv/PickDeployer.java Sat May 14 14:49:52 2005
@@ -61,10 +61,10 @@
             String untilDeadlineExpression = onAlarmElt.valueOf("@until");
             String timeExpression = null;
             int expressionType = 0;
-            if (forDurationExpression != null) {
+            if (forDurationExpression != null && forDurationExpression.length() > 0) {
                 timeExpression = forDurationExpression;
                 expressionType = AlarmEvent.DURATION_EXPR;
-            } else if (untilDeadlineExpression != null) {
+            } else if (untilDeadlineExpression != null && untilDeadlineExpression.length() > 0) {
                 timeExpression = untilDeadlineExpression;
                 expressionType = AlarmEvent.DEADLINE_EXPR;
             }

Modified: incubator/agila/trunk/modules/bpel/engine/deployer/src/java/org/apache/agila/bpel/deployer/priv/WaitDeployer.java
URL: http://svn.apache.org/viewcvs/incubator/agila/trunk/modules/bpel/engine/deployer/src/java/org/apache/agila/bpel/deployer/priv/WaitDeployer.java?rev=170171&r1=170170&r2=170171&view=diff
==============================================================================
--- incubator/agila/trunk/modules/bpel/engine/deployer/src/java/org/apache/agila/bpel/deployer/priv/WaitDeployer.java (original)
+++ incubator/agila/trunk/modules/bpel/engine/deployer/src/java/org/apache/agila/bpel/deployer/priv/WaitDeployer.java Sat May 14 14:49:52 2005
@@ -39,10 +39,10 @@
         String forDurationExpression = element.valueOf("@for");
         String untilDeadlineExpression = element.valueOf("@until");
         Wait wait = (Wait) activity;
-        if (forDurationExpression != null) {
+        if (forDurationExpression != null && forDurationExpression.length() > 0) {
             wait.setDuration(true);
             wait.setTime(forDurationExpression);
-        } else if (untilDeadlineExpression != null) {
+        } else if (untilDeadlineExpression != null && untilDeadlineExpression.length() > 0) {
             wait.setDuration(false);
             wait.setTime(untilDeadlineExpression);
         }