Repository: camel Updated Branches: refs/heads/master 25461f9d4 -> 6f3e8d29d
CAMEL-8637: Upgrade Jetty version to 9.x in Camel-CometD - Fixed CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/720e76d2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/720e76d2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/720e76d2 Branch: refs/heads/master Commit: 720e76d2554c29d647be8a2c634991c8d4929f32 Parents: 0b641ee Author: Andrea Cosentino <anco...@gmail.com> Authored: Thu Apr 21 14:42:25 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Thu Apr 21 15:18:40 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/component/cometd/CometdComponent.java | 4 ++-- .../org/apache/camel/component/cometd/CometdConsumerTest.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/720e76d2/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java index 61179c7..00734d3 100644 --- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java +++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java @@ -100,7 +100,7 @@ public class CometdComponent extends UriEndpointComponent { * Connects the URL specified on the endpoint to the specified processor. */ public void connect(CometdProducerConsumer prodcon) throws Exception { - Server server = null; + Server server = null; // Make sure that there is a connector for the requested endpoint. CometdEndpoint endpoint = prodcon.getEndpoint(); String connectorKey = endpoint.getProtocol() + ":" + endpoint.getUri().getHost() + ":" + endpoint.getPort(); @@ -175,7 +175,7 @@ public class CometdComponent extends UriEndpointComponent { } protected CometDServlet createServletForConnector(Server server, Connector connector, CometdEndpoint endpoint) throws Exception { - CometDServlet servlet = new CometDServlet(); + CometDServlet servlet = new CometDServlet(); ServletContextHandler context = new ServletContextHandler(server, "/", ServletContextHandler.NO_SECURITY | ServletContextHandler.NO_SESSIONS); http://git-wip-us.apache.org/repos/asf/camel/blob/720e76d2/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java index 8cd8bd2..ca9fdf6 100644 --- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java +++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java @@ -39,7 +39,6 @@ import org.mockito.runners.MockitoJUnitRunner; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.anyObject; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when;
