Appologies for the sudden checkin without notice, close to the release cycle.

Reverting the changes back. Will attach a patch and commit after the release.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@719657 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 11 insertions, 54 deletions

diff --git a/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
index 4bba7b113d..7411e81bd6 100644
--- a/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
@@ -20,45 +20,23 @@
  */
 package org.apache.qpid.tools;
 
-import static org.apache.qpid.tools.QpidBench.Mode.BOTH;
-import static org.apache.qpid.tools.QpidBench.Mode.CONSUME;
-import static org.apache.qpid.tools.QpidBench.Mode.PUBLISH;
-
-import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
-
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.TextMessage;
+import java.util.UUID;
+import javax.jms.*;
 
 import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.thread.Threading;
-import org.apache.qpid.transport.DeliveryProperties;
-import org.apache.qpid.transport.ExchangeBind;
-import org.apache.qpid.transport.Header;
-import org.apache.qpid.transport.MessageAcceptMode;
-import org.apache.qpid.transport.MessageAcquireMode;
-import org.apache.qpid.transport.MessageCreditUnit;
-import org.apache.qpid.transport.MessageDeliveryMode;
-import org.apache.qpid.transport.MessageFlowMode;
-import org.apache.qpid.transport.MessageProperties;
-import org.apache.qpid.transport.MessageSubscribe;
-import org.apache.qpid.transport.MessageTransfer;
-import org.apache.qpid.transport.QueueDeclare;
-import org.apache.qpid.transport.SessionException;
-import org.apache.qpid.transport.SessionListener;
+import org.apache.qpid.transport.*;
+import org.apache.qpid.transport.network.io.IoTransport;
 import org.apache.qpid.util.UUIDGen;
 import org.apache.qpid.util.UUIDs;
 
+import static org.apache.qpid.tools.QpidBench.Mode.*;
+
 /**
  * QpidBench
  *
@@ -434,7 +412,7 @@ public class QpidBench
         {
         case CONSUME:
         case BOTH:
-            Runnable r = new Runnable()
+            new Thread()
             {
                 public void run()
                 {
@@ -454,18 +432,7 @@ public class QpidBench
                         throw new RuntimeException(e);
                     }
                 }
-            };
-           
-            Thread t;
-            try
-            {
-                t = Threading.getThreadFactory().createThread(r);                      
-            }
-            catch(Exception e)
-            {
-                throw new Error("Error creating consumer thread",e);
-            }
-            t.start();
+            }.start();
             break;
         }
 
@@ -473,7 +440,7 @@ public class QpidBench
         {
         case PUBLISH:
         case BOTH:
-            Runnable r = new Runnable()
+            new Thread()
             {
                 public void run()
                 {
@@ -493,17 +460,7 @@ public class QpidBench
                         throw new RuntimeException(e);
                     }
                 }
-            };
-            Thread t;
-            try
-            {
-                t = Threading.getThreadFactory().createThread(r);                      
-            }
-            catch(Exception e)
-            {
-                throw new Error("Error creating publisher thread",e);
-            }
-            t.start();
+            }.start();
             break;
         }
     }