You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2012/02/16 08:57:13 UTC
svn commit: r1244880 - in /camel/branches/camel-2.8.x: ./
components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
components/camel-http/
Author: ningjiang
Date: Thu Feb 16 07:57:12 2012
New Revision: 1244880
URL: http://svn.apache.org/viewvc?rev=1244880&view=rev
Log:
Merged revisions 1244875 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x
................
r1244875 | ningjiang | 2012-02-16 15:49:11 +0800 (Thu, 16 Feb 2012) | 9 lines
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.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
camel/branches/camel-2.8.x/components/camel-http/ (props changed)
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 16 07:57:12 2012
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.9.x:1227549,1228229,1229567,1234054,1236672,1238942,1240157,1241006,1241489,1243052,1243058
-/camel/trunk:1226860,1227540,1228223,1229565,1234043,1236667,1238937,1240025,1240950,1240967,1241482,1243046,1243057
+/camel/branches/camel-2.9.x:1227549,1228229,1229567,1234054,1236672,1238942,1240157,1241006,1241489,1243052,1243058,1244875
+/camel/trunk:1226860,1227540,1228223,1229565,1234043,1236667,1238937,1240025,1240950,1240967,1241482,1243046,1243057,1244870
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.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.8.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java?rev=1244880&r1=1244879&r2=1244880&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java (original)
+++ camel/branches/camel-2.8.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java Thu Feb 16 07:57:12 2012
@@ -131,7 +131,7 @@ public abstract class AbstractCamelRedel
}
}
if (delayPattern != null) {
- answer.setDelayPattern(delayPattern);
+ answer.setDelayPattern(CamelContextHelper.parseText(context, delayPattern));
}
return answer;
Propchange: camel/branches/camel-2.8.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 16 07:57:12 2012
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.9.x/components/camel-http:1234054,1241006,1241489,1243052,1243058
+/camel/branches/camel-2.9.x/components/camel-http:1234054,1241006,1241489,1243052,1243058,1244875
/camel/trunk/components/camel-http:1226860,1228223,1234043