Author: borges Date: 2011-09-30 05:08:42 -0400 (Fri, 30 Sep 2011) New Revision: 11450 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: Insert place holders to make sure warnings are turned on again before merging 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-30 08:58:28 UTC (rev 11449) +++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java 2011-09-30 09:08:42 UTC (rev 11450) @@ -425,6 +425,7 @@ paused = false; + // HORNETQ-720 if (!Version.ID.equals(VersionLoader.getVersion().getNettyVersion()) && false) { NettyAcceptor.log.warn("Unexpected Netty Version was expecting " + VersionLoader.getVersion() 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-30 08:58:28 UTC (rev 11449) +++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/remoting/impl/netty/NettyConnector.java 2011-09-30 09:08:42 UTC (rev 11450) @@ -378,6 +378,7 @@ batchFlusherFuture = scheduledThreadPool.scheduleWithFixedDelay(flusher, batchDelay, batchDelay, TimeUnit.MILLISECONDS); } + // HORNETQ-720 if (!Version.ID.equals(VersionLoader.getVersion().getNettyVersion()) && false) { NettyConnector.log.warn("Unexpected Netty Version was expecting " + VersionLoader.getVersion()