svn commit: r719044 - in /activemq/camel/branches/camel-1.x: ./ camel-core/src/main/java/org/apache/camel/model/DelayerType.java

[janstey]

Author: janstey
Date: Wed Nov 19 12:06:17 2008
New Revision: 719044

URL: http://svn.apache.org/viewvc?rev=719044&view=rev
Log:
Merged revisions 719041 via svnmerge from 
https://svn.apache.org/repos/asf/activemq/camel/trunk

........
  r719041 | janstey | 2008-11-19 16:24:09 -0330 (Wed, 19 Nov 2008) | 1 line
  
  CAMEL-1103 - Change delayer type so that it actually creates the expression 
properly
........

Modified:
    activemq/camel/branches/camel-1.x/   (props changed)
    
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/DelayerType.java

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/DelayerType.java?rev=719044&r1=719043&r2=719044&view=diff
==============================================================================
--- 
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
 (original)
+++ 
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
 Wed Nov 19 12:06:17 2008
@@ -83,7 +83,8 @@
     private Expression createAbsoluteTimeDelayExpression(RouteContext 
routeContext) {
         ExpressionType expr = getExpression();
         if (expr != null) {
-            if (ObjectHelper.isNotNullAndNonEmpty(expr.getLanguage())) {
+            if (ObjectHelper.isNotNullAndNonEmpty(expr.getExpression()) || 
+                expr.getExpressionValue() != null) {
                 return expr.createExpression(routeContext);
             } 
         }