[hornetq-commits] JBoss hornetq SVN: r11419 - branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/remoting/impl/netty.

Author: borges Date: 2011-09-26 06:36:08 -0400 (Mon, 26 Sep 2011) New Revision: 11419 Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/remoting/impl/netty/NettyConnector.java Log: XXX TEMPORARILY Turn off noisy warnings Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java =================================================================== --- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java 2011-09-26 10:35:30 UTC (rev 11418) +++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java 2011-09-26 10:36:08 UTC (rev 11419) @@ -346,7 +346,7 @@ if (httpEnabled) { handlers.put("http-decoder", new HttpRequestDecoder()); - + handlers.put("http-aggregator", new HttpChunkAggregator(Integer.MAX_VALUE)); handlers.put("http-encoder", new HttpResponseEncoder()); @@ -425,7 +425,7 @@ paused = false; - if (!Version.ID.equals(VersionLoader.getVersion().getNettyVersion())) + if (!Version.ID.equals(VersionLoader.getVersion().getNettyVersion()) && false) { NettyAcceptor.log.warn("Unexpected Netty Version was expecting " + VersionLoader.getVersion() .getNettyVersion() + @@ -625,7 +625,7 @@ return new String[0]; } String[] hosts = commaSeparatedHosts.split(","); - + for (int i = 0; i < hosts.length; i++) { hosts[i] = hosts[i].trim(); @@ -709,12 +709,12 @@ public void connectionReadyForWrites(final Object connectionID, boolean ready) { NettyConnection conn = connections.get(connectionID); - + if (conn != null) { conn.fireReady(ready); - } - } + } + } } private class BatchFlusher implements Runnable Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/remoting/impl/netty/NettyConnector.java =================================================================== --- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/remoting/impl/netty/NettyConnector.java 2011-09-26 10:35:30 UTC (rev 11418) +++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/remoting/impl/netty/NettyConnector.java 2011-09-26 10:36:08 UTC (rev 11419) @@ -143,9 +143,9 @@ private final ScheduledExecutorService scheduledThreadPool; private final Executor closeExecutor; - + private BatchFlusher flusher; - + private ScheduledFuture<?> batchFlusherFuture; // Static -------------------------------------------------------- @@ -355,7 +355,7 @@ handlers.add(new HttpRequestEncoder()); handlers.add(new HttpResponseDecoder()); - + handlers.add(new HttpChunkAggregator(Integer.MAX_VALUE)); handlers.add(new HttpHandler()); @@ -374,11 +374,11 @@ if (batchDelay > 0) { flusher = new BatchFlusher(); - + batchFlusherFuture = scheduledThreadPool.scheduleWithFixedDelay(flusher, batchDelay, batchDelay, TimeUnit.MILLISECONDS); } - if (!Version.ID.equals(VersionLoader.getVersion().getNettyVersion())) + if (!Version.ID.equals(VersionLoader.getVersion().getNettyVersion()) && false) { NettyConnector.log.warn("Unexpected Netty Version was expecting " + VersionLoader.getVersion() .getNettyVersion() + @@ -387,22 +387,22 @@ } NettyConnector.log.debug("Started Netty Connector version " + Version.ID); } - + public synchronized void close() { if (channelFactory == null) { return; } - + if (batchFlusherFuture != null) { batchFlusherFuture.cancel(false); - + flusher.cancel(); - + flusher = null; - + batchFlusherFuture = null; } @@ -533,7 +533,7 @@ private String cookie; private final CookieEncoder cookieEncoder = new CookieEncoder(false); - + public HttpHandler() throws Exception { url = new URI("http", null, host, port, servletPath, null, null).toString(); @@ -705,10 +705,10 @@ public void connectionReadyForWrites(Object connectionID, boolean ready) { } - - + + } - + private class BatchFlusher implements Runnable { private boolean cancelled;