Merge in default.

Author: Steve Powell

src/com/rabbitmq/client/ConnectionFactory.java

@@ -45,33 +45,34 @@
 public class ConnectionFactory implements Cloneable {
 
     /** Default Executor threads */
-    private static final int    DEFAULT_NUM_CONSUMER_THREADS = 5;
+    public static final int    DEFAULT_NUM_CONSUMER_THREADS = 5;
     /** Default user name */
-    private static final String DEFAULT_USER = "guest";
+    public static final String DEFAULT_USER = "guest";
     /** Default password */
-    private static final String DEFAULT_PASS = "guest";
+    public static final String DEFAULT_PASS = "guest";
     /** Default virtual host */
-    private static final String DEFAULT_VHOST = "/";
+    public static final String DEFAULT_VHOST = "/";
     /** Default maximum channel number;
      *  zero for unlimited */
-    private static final int    DEFAULT_CHANNEL_MAX = 0;
+    public static final int    DEFAULT_CHANNEL_MAX = 0;
     /** Default maximum frame size;
      *  zero means no limit */
-    private static final int    DEFAULT_FRAME_MAX = 0;
+    public static final int    DEFAULT_FRAME_MAX = 0;
     /** Default heart-beat interval;
      *  zero means no heart-beats */
-    private static final int    DEFAULT_HEARTBEAT = 0;
+    public static final int    DEFAULT_HEARTBEAT = 0;
     /** The default host */
-    private static final String DEFAULT_HOST = "localhost";
+    public static final String DEFAULT_HOST = "localhost";
     /** 'Use the default port' port */
-    private static final int    USE_DEFAULT_PORT = -1;
+    public static final int    USE_DEFAULT_PORT = -1;
     /** The default non-ssl port */
-    private static final int    DEFAULT_AMQP_PORT = AMQP.PROTOCOL.PORT;
+    public static final int    DEFAULT_AMQP_PORT = AMQP.PROTOCOL.PORT;
     /** The default ssl port */
-    private static final int    DEFAULT_AMQP_OVER_SSL_PORT = 5671;
+    public static final int    DEFAULT_AMQP_OVER_SSL_PORT = 5671;
     /** The default connection timeout;
      *  zero means wait indefinitely */
-    private static final int    DEFAULT_CONNECTION_TIMEOUT = 0;
+    public static final int    DEFAULT_CONNECTION_TIMEOUT = 0;
+
     /** The default SSL protocol */
     private static final String DEFAULT_SSL_PROTOCOL = "SSLv3";
 

src/com/rabbitmq/client/impl/AMQChannel.java

@@ -153,13 +153,17 @@ public void handleCompleteInboundCommand(AMQCommand command) throws IOException
     public void enqueueRpc(RpcContinuation k)
     {
         synchronized (_channelMutex) {
+            boolean waitClearedInterruptStatus = false;
             while (_activeRpc != null) {
                 try {
                     _channelMutex.wait();
                 } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
+                    waitClearedInterruptStatus = true;
                 }
             }
+            if (waitClearedInterruptStatus) {
+                Thread.currentThread().interrupt();
+            }
             _activeRpc = k;
         }
     }

test/src/com/rabbitmq/client/test/BrokenFramesTest.java

@@ -65,18 +65,18 @@ public void testNoMethod() throws Exception {
         frames.add(new Frame(AMQP.FRAME_HEADER, 0));
         myFrameHandler.setFrames(frames.iterator());
 
-        AMQConnection conn = new AMQConnection(factory.getUsername(),
-                                               factory.getPassword(),
-                                               myFrameHandler,
-                                               Executors.newFixedThreadPool(1),
-                                               factory.getVirtualHost(),
-                                               factory.getClientProperties(),
-                                               factory.getRequestedFrameMax(),
-                                               factory.getRequestedChannelMax(),
-                                               factory.getRequestedHeartbeat(),
-                                               factory.getSaslConfig());
         try {
-            conn.start();
+            new AMQConnection(factory.getUsername(),
+                              factory.getPassword(),
+                              myFrameHandler,
+                              Executors.newFixedThreadPool(1),
+                              factory.getVirtualHost(),
+                              factory.getClientProperties(),
+                              factory.getRequestedFrameMax(),
+                              factory.getRequestedChannelMax(),
+                              factory.getRequestedHeartbeat(),
+                              factory.getSaslConfig())
+            .start();
         } catch (IOException e) {
             UnexpectedFrameError unexpectedFrameError = findUnexpectedFrameError(e);
             assertNotNull(unexpectedFrameError);