From 1c8ee2b1168ca8851d070f6d138d101e192d6b31 Mon Sep 17 00:00:00 2001
From: Mike Hearn <mike@plan99.net>
Date: Fri, 1 Mar 2013 16:44:27 +0100
Subject: [PATCH] Upgrade to the latest Netty. Resolves issue 321.

---
 core/pom.xml                                                  | 2 +-
 core/src/test/java/com/google/bitcoin/core/FakeChannel.java   | 4 ++--
 .../test/java/com/google/bitcoin/core/TestWithPeerGroup.java  | 1 +
 pom.xml                                                       | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 15395d57..c2356192 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -168,7 +168,7 @@
 	    <dependency>
 	        <groupId>io.netty</groupId>
 	        <artifactId>netty</artifactId>
-	        <version>3.3.1.Final</version>
+	        <version>3.6.3.Final</version>
 	    </dependency>
 
         <dependency>
diff --git a/core/src/test/java/com/google/bitcoin/core/FakeChannel.java b/core/src/test/java/com/google/bitcoin/core/FakeChannel.java
index 3dbc6260..6de5bb1f 100644
--- a/core/src/test/java/com/google/bitcoin/core/FakeChannel.java
+++ b/core/src/test/java/com/google/bitcoin/core/FakeChannel.java
@@ -1,14 +1,14 @@
 package com.google.bitcoin.core;
 
 import org.jboss.netty.channel.*;
-import org.jboss.netty.util.internal.QueueFactory;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
+import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 
 public class FakeChannel extends AbstractChannel {
-    final BlockingQueue<ChannelEvent> events = QueueFactory.createQueue(ChannelEvent.class);
+    final BlockingQueue<ChannelEvent> events = new ArrayBlockingQueue<ChannelEvent>(1000);
 
     private final ChannelConfig config;
     private SocketAddress localAddress;
diff --git a/core/src/test/java/com/google/bitcoin/core/TestWithPeerGroup.java b/core/src/test/java/com/google/bitcoin/core/TestWithPeerGroup.java
index c631d9fb..7fce6624 100644
--- a/core/src/test/java/com/google/bitcoin/core/TestWithPeerGroup.java
+++ b/core/src/test/java/com/google/bitcoin/core/TestWithPeerGroup.java
@@ -44,6 +44,7 @@ public class TestWithPeerGroup extends TestWithNetworkConnections {
                 ChannelSink sink = new FakeChannelSink();
                 return new FakeChannel(this, pipeline, sink);
             }
+            public void shutdown() {}
         });
         bootstrap.setPipelineFactory(new ChannelPipelineFactory() {
             public ChannelPipeline getPipeline() throws Exception {
diff --git a/pom.xml b/pom.xml
index 544b0b30..96584587 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,7 +174,7 @@
       <dependency>
 	    <groupId>io.netty</groupId>
 	    <artifactId>netty</artifactId>
-	    <version>3.3.1.Final</version>
+	    <version>${netty.version}</version>
 	    <scope>compile</scope>
       </dependency>
 
@@ -203,6 +203,7 @@
     <slf4j.version>1.6.2</slf4j.version>
     <derby.version>10.8.2.2</derby.version>
     <protobuf.version>2.4.1</protobuf.version>
+    <netty.version>3.6.3.Final</netty.version>
     <generated.sourceDirectory>gen</generated.sourceDirectory>
   </properties>