Author: davsclaus
Date: Thu Sep 29 14:04:22 2011
New Revision: 1177311
URL: http://svn.apache.org/viewvc?rev=1177311&view=rev
Log:
Merged revisions 1177309 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 29 14:04:22 2011
@@ -1 +1 @@
-/camel/trunk:1177126
+/camel/trunk:1177126,1177309
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java?rev=1177311&r1=1177310&r2=1177311&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
Thu Sep 29 14:04:22 2011
@@ -329,7 +329,7 @@ public class SplitDefinition extends Exp
}
public Long getTimeout() {
- return timeout != null ? timeout : 0;
+ return timeout;
}
public void setTimeout(Long timeout) {
