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 1E3CBD6D7 for ; Sat, 7 Jul 2012 10:56:12 +0000 (UTC) Received: (qmail 99847 invoked by uid 500); 7 Jul 2012 10:56:10 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 99689 invoked by uid 500); 7 Jul 2012 10:56:06 -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 99602 invoked by uid 99); 7 Jul 2012 10:56:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Jul 2012 10:56:02 +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; Sat, 07 Jul 2012 10:56:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 87AF323889CB; Sat, 7 Jul 2012 10:55:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1358539 - in /camel/trunk: camel-core/src/test/java/org/apache/camel/processor/enricher/ components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/ components/camel-core-xml/src/main/java/org/apache/camel/core/xml/ components/... Date: Sat, 07 Jul 2012 10:55:41 -0000 To: commits@camel.apache.org From: bvahdat@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120707105541.87AF323889CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bvahdat Date: Sat Jul 7 10:55:40 2012 New Revision: 1358539 URL: http://svn.apache.org/viewvc?rev=1358539&view=rev Log: Polished and fixed one CS error. Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/TestUtil.java camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextList.java Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java?rev=1358539&r1=1358538&r2=1358539&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java Sat Jul 7 10:55:40 2012 @@ -16,7 +16,6 @@ */ package org.apache.camel.processor.enricher; -import java.util.ArrayList; import java.util.List; import org.apache.camel.ContextTestSupport; @@ -129,7 +128,7 @@ public class PollEnricherTest extends Co template.sendBody("seda:foo5", "msg3"); template.sendBody("seda:foo5", "msg4"); - List polledExchanges = mock.getExchanges().get(0).getIn().getBody(List.class); + List polledExchanges = mock.getExchanges().get(0).getIn().getBody(List.class); assertEquals(2, polledExchanges.size()); mock.expectedHeaderReceived(Exchange.TO_ENDPOINT, "seda://foo5"); @@ -147,7 +146,7 @@ public class PollEnricherTest extends Co Thread.sleep(500); - List polledExchanges = mock.getExchanges().get(0).getIn().getBody(List.class); + List polledExchanges = mock.getExchanges().get(0).getIn().getBody(List.class); assertEquals(4, polledExchanges.size()); mock.expectedHeaderReceived(Exchange.TO_ENDPOINT, "seda://foo6"); Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java?rev=1358539&r1=1358538&r2=1358539&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java (original) +++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java Sat Jul 7 10:55:40 2012 @@ -63,7 +63,7 @@ public abstract class BindyAbstractFacto this.type = type; if (LOG.isDebugEnabled()) { - LOG.debug("Class name: {}", type.getName()); + LOG.debug("Class name: {}", type.getName()); } initModel(); Modified: camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java?rev=1358539&r1=1358538&r2=1358539&view=diff ============================================================================== --- camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java (original) +++ camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java Sat Jul 7 10:55:40 2012 @@ -343,7 +343,7 @@ public abstract class AbstractCamelConte agent.setRegisterAlways(CamelContextHelper.parseBoolean(getContext(), camelJMXAgent.getRegisterAlways())); agent.setRegisterNewRoutes(CamelContextHelper.parseBoolean(getContext(), camelJMXAgent.getRegisterNewRoutes())); - ManagementStrategy managementStrategy = new ManagedManagementStrategy(agent); + ManagementStrategy managementStrategy = new ManagedManagementStrategy(getContext(), agent); getContext().setManagementStrategy(managementStrategy); // clear the existing lifecycle strategies define by the DefaultCamelContext constructor Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java?rev=1358539&r1=1358538&r2=1358539&view=diff ============================================================================== --- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java (original) +++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java Sat Jul 7 10:55:40 2012 @@ -75,7 +75,6 @@ public class JmsEndpoint extends Default private String selector; private JmsConfiguration configuration; private final AtomicBoolean running = new AtomicBoolean(); - private volatile boolean destroying; public JmsEndpoint() { this(null, null); @@ -150,22 +149,9 @@ public class JmsEndpoint extends Default } public JmsConsumer createConsumer(Processor processor) throws Exception { - synchronized (this) { - while (destroying) { - wait(); - } - } AbstractMessageListenerContainer listenerContainer = createMessageListenerContainer(); return createConsumer(processor, listenerContainer); } - - private void destroyMessageListenerContainerInternal(AbstractMessageListenerContainer listenerContainer) { - listenerContainer.destroy(); - destroying = false; - synchronized (this) { - notifyAll(); - } - } public AbstractMessageListenerContainer createMessageListenerContainer() throws Exception { return configuration.createMessageListenerContainer(this); Modified: camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java?rev=1358539&r1=1358538&r2=1358539&view=diff ============================================================================== --- camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java (original) +++ camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java Sat Jul 7 10:55:40 2012 @@ -43,9 +43,9 @@ public class LuceneSearcher { public void open(File indexDirectory, Analyzer analyzer) throws IOException { if (indexDirectory != null) { - indexSearcher = new IndexSearcher(IndexReader.open(new NIOFSDirectory(indexDirectory), true)); + indexSearcher = new IndexSearcher(IndexReader.open(new NIOFSDirectory(indexDirectory))); } else { - indexSearcher = new IndexSearcher(IndexReader.open(new NIOFSDirectory(new File("./indexDirectory")), true)); + indexSearcher = new IndexSearcher(IndexReader.open(new NIOFSDirectory(new File("./indexDirectory")))); } this.analyzer = analyzer; } Modified: camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/TestUtil.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/TestUtil.java?rev=1358539&r1=1358538&r2=1358539&view=diff ============================================================================== --- camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/TestUtil.java (original) +++ camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/TestUtil.java Sat Jul 7 10:55:40 2012 @@ -22,7 +22,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import org.apache.camel.util.IOHelper; -import org.apache.camel.util.ObjectHelper; public final class TestUtil { private TestUtil() { Modified: camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextList.java URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextList.java?rev=1358539&r1=1358538&r2=1358539&view=diff ============================================================================== --- camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextList.java (original) +++ camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextList.java Sat Jul 7 10:55:40 2012 @@ -25,9 +25,6 @@ import org.apache.camel.CamelContext; import org.apache.felix.gogo.commands.Command; import org.apache.karaf.shell.console.OsgiCommandSupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * List the Camel contexts available in the Karaf instance. */ @@ -88,7 +85,7 @@ public class ContextList extends OsgiCom maxUptimeLen = java.lang.Math.max(maxUptimeLen, uptime == null ? 0 : uptime.length()); } - final Map retval = new Hashtable(3); + final Map retval = new Hashtable(3); retval.put(NAME_COLUMN_LABEL, maxNameLen); retval.put(STATUS_COLUMN_LABEL, maxStatusLen); retval.put(UPTIME_COLUMN_LABEL, maxUptimeLen);