svn commit: r1244875 - in /camel/branches/camel-2.9.x: ./ components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java

[ningjiang]

Author: ningjiang
Date: Thu Feb 16 07:49:11 2012
New Revision: 1244875

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

........
  r1244870 | ningjiang | 2012-02-16 15:37:32 +0800 (Thu, 16 Feb 2012) | 1 line
  
  Support to load the delayPattern from camel properties component
........

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 16 07:49:11 2012
@@ -1 +1 @@
-/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864
+/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870

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

Modified: 
camel/branches/camel-2.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java?rev=1244875&r1=1244874&r2=1244875&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
 Thu Feb 16 07:49:11 2012
@@ -131,7 +131,7 @@ public abstract class AbstractCamelRedel
             }
         }
         if (delayPattern != null) {
-            answer.setDelayPattern(delayPattern);
+            answer.setDelayPattern(CamelContextHelper.parseText(context, 
delayPattern));
         }
 
         return answer;