svn commit: r1092453 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/model/ main/java/org/apache/camel/processor/ test/java/org/apache/camel/issues/

[davsclaus]

Author: davsclaus
Date: Thu Apr 14 19:33:54 2011
New Revision: 1092453

URL: http://svn.apache.org/viewvc?rev=1092453&view=rev
Log:
CAMEL-3866: Option on throttler should be required.

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Throttler.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/MulticastParallelStopOnExceptionWithOnExceptionIssueTest.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java?rev=1092453&r1=1092452&r2=1092453&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
 Thu Apr 14 19:33:54 2011
@@ -44,7 +44,7 @@ public class ThrottleDefinition extends 
     private ExecutorService executorService;
     @XmlAttribute
     private String executorServiceRef;
-    @XmlAttribute
+    @XmlAttribute(required = true)
     private Long maximumRequestsPerPeriod;
     @XmlAttribute
     private Long timePeriodMillis;

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Throttler.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Throttler.java?rev=1092453&r1=1092452&r2=1092453&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Throttler.java 
(original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Throttler.java 
Thu Apr 14 19:33:54 2011
@@ -44,6 +44,9 @@ public class Throttler extends DelayProc
     public Throttler(Processor processor, long maximumRequestsPerPeriod, long 
timePeriodMillis, ScheduledExecutorService executorService) {
         super(processor, executorService);
         this.maximumRequestsPerPeriod = maximumRequestsPerPeriod;
+        if (maximumRequestsPerPeriod <= 0) {
+            throw new IllegalArgumentException("MaximumRequestsPerPeriod 
should be a positive number, was: " + maximumRequestsPerPeriod);
+        }
         this.timePeriodMillis = timePeriodMillis;
     }
 

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/MulticastParallelStopOnExceptionWithOnExceptionIssueTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/MulticastParallelStopOnExceptionWithOnExceptionIssueTest.java?rev=1092453&r1=1092452&r2=1092453&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/MulticastParallelStopOnExceptionWithOnExceptionIssueTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/MulticastParallelStopOnExceptionWithOnExceptionIssueTest.java
 Thu Apr 14 19:33:54 2011
@@ -53,7 +53,7 @@ public class MulticastParallelStopOnExce
             }
         });
 
-        // we run in parallel so the task could have been submitted so we 
either get 0 or 1 messages at mock:end2
+        // we run in parallel so the task could have been submitted so we 
either get 0 or 1 messages at mock:end1
         getMockEndpoint("mock:end1").expectedMinimumMessageCount(0);
         getMockEndpoint("mock:end3").expectedMessageCount(0);
         getMockEndpoint("mock:end4").expectedMessageCount(1);