Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 23F0490EC for ; Tue, 10 Apr 2012 14:32:47 +0000 (UTC) Received: (qmail 96042 invoked by uid 500); 10 Apr 2012 14:32:47 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 96014 invoked by uid 500); 10 Apr 2012 14:32:47 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 96007 invoked by uid 99); 10 Apr 2012 14:32:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Apr 2012 14:32:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Apr 2012 14:32:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0E7542388847; Tue, 10 Apr 2012 14:32:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1311754 - in /camel/trunk: camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutTest.java examples/camel-example-console/src/main/java/org/apache/camel/example/console/CamelConsoleMain.java Date: Tue, 10 Apr 2012 14:32:22 -0000 To: commits@camel.apache.org From: hadrian@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120410143223.0E7542388847@eris.apache.org> Author: hadrian Date: Tue Apr 10 14:32:22 2012 New Revision: 1311754 URL: http://svn.apache.org/viewvc?rev=1311754&view=rev Log: CS fixes Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutTest.java camel/trunk/examples/camel-example-console/src/main/java/org/apache/camel/example/console/CamelConsoleMain.java Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutTest.java?rev=1311754&r1=1311753&r2=1311754&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutTest.java Tue Apr 10 14:32:22 2012 @@ -30,7 +30,7 @@ import org.apache.camel.processor.aggreg */ public class AggregateTimeoutTest extends ContextTestSupport { - private static final AtomicInteger invoked = new AtomicInteger(); + private static final AtomicInteger INVOKED = new AtomicInteger(); public void testAggregateTimeout() throws Exception { MockEndpoint mock = getMockEndpoint("mock:aggregated"); @@ -45,7 +45,7 @@ public class AggregateTimeoutTest extend mock.assertIsSatisfied(); // should invoke the timeout method - assertEquals(1, invoked.get()); + assertEquals(1, INVOKED.get()); // now send 3 which does not timeout mock.reset(); @@ -59,7 +59,7 @@ public class AggregateTimeoutTest extend mock.await(1500, TimeUnit.MILLISECONDS); // should not invoke the timeout method - assertEquals(1, invoked.get()); + assertEquals(1, INVOKED.get()); } @Override @@ -81,7 +81,7 @@ public class AggregateTimeoutTest extend private static class MyAggregationStrategy implements TimeoutAwareAggregationStrategy { public void timeout(Exchange oldExchange, int index, int total, long timeout) { - invoked.incrementAndGet(); + INVOKED.incrementAndGet(); assertEquals(2000, timeout); assertEquals(-1, total); Modified: camel/trunk/examples/camel-example-console/src/main/java/org/apache/camel/example/console/CamelConsoleMain.java URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-console/src/main/java/org/apache/camel/example/console/CamelConsoleMain.java?rev=1311754&r1=1311753&r2=1311754&view=diff ============================================================================== --- camel/trunk/examples/camel-example-console/src/main/java/org/apache/camel/example/console/CamelConsoleMain.java (original) +++ camel/trunk/examples/camel-example-console/src/main/java/org/apache/camel/example/console/CamelConsoleMain.java Tue Apr 10 14:32:22 2012 @@ -21,7 +21,10 @@ import org.apache.camel.spring.Main; /** * A main class to run the example from your editor. */ -public class CamelConsoleMain { +public final class CamelConsoleMain { + + private CamelConsoleMain() { + } public static void main(String[] args) throws Exception { // Main makes it easier to run a Spring application