Merge in default

Author: Steve Powell

src/com/rabbitmq/client/AlreadyClosedException.java

@@ -17,7 +17,7 @@
 
 package com.rabbitmq.client;
 
-/*
+/**
  * Thrown when application tries to perform an action on connection/channel
  * which was already closed
  */

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

@@ -19,10 +19,14 @@
 import java.io.IOException;
 
 import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.AlreadyClosedException;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.Consumer;
 
+/**
+ * Default implementation of {@link ExceptionHandler} used by {@link AMQConnection}.
+ */
 public class DefaultExceptionHandler implements ExceptionHandler {
     public void handleUnexpectedConnectionDriverException(Connection conn, Throwable exception) {
         // TODO: Log this somewhere, just in case we have a bug like
@@ -55,23 +59,21 @@ public void handleConsumerException(Channel channel, Throwable exception,
                                               + " for channel " + channel);
     }
 
-    protected void handleChannelKiller(Channel channel,
-                                       Throwable exception,
-                                       String what)
-    {
-        // TODO: Convert to logging framework
-        System.err.println(what + " threw an exception for channel " +
-                           channel + ":");
+    protected void handleChannelKiller(Channel channel, Throwable exception, String what) {
+        // TODO: log the exception
+        System.err.println("DefaultExceptionHandler: " + what + " threw an exception for channel "
+                + channel + ":");
         exception.printStackTrace();
         try {
-            ((AMQConnection) channel.getConnection()).close(AMQP.INTERNAL_ERROR,
-                                                            "Internal error in " + what,
-                                                            false,
-                                                            exception);
+            channel.close(AMQP.REPLY_SUCCESS, "Closed due to exception from " + what);
+        } catch (AlreadyClosedException ace) {
+            // noop
         } catch (IOException ioe) {
-            // Man, this clearly isn't our day.
-            // Ignore the exception? TODO: Log the nested failure
+            // TODO: log the failure
+            System.err.println("Failure during close of channel " + channel + " after " + exception
+                    + ":");
+            ioe.printStackTrace();
+            channel.getConnection().abort(AMQP.INTERNAL_ERROR, "Internal error closing channel for " + what);
         }
-
     }
 }

src/com/rabbitmq/tools/json/JSONReader.java

@@ -59,9 +59,22 @@ private char next() {
     }
 
     private void skipWhiteSpace() {
-        while (Character.isWhitespace(c)) {
-            next();
-        }
+        boolean cont;
+
+        do {
+            cont = true;
+            if (Character.isWhitespace(c)) {
+                next();
+            }
+            else if (c == '/' && next() == '/') {
+                while (c != '\n') {
+                    next();
+                }
+            }
+            else {
+                cont = false;
+            }
+        } while (cont);
     }
 
     public Object read(String string) {
@@ -74,7 +87,7 @@ private Object read() {
         Object ret = null;
         skipWhiteSpace();
 
-        if (c == '"') {
+        if (c == '"' || c == '\'') {
             next();
             ret = string();
         } else if (c == '[') {
@@ -168,7 +181,7 @@ private Object number() {
 
     private Object string() {
         buf.setLength(0);
-        while (c != '"') {
+        while (c != '"' && c != '\'') {
             if (c == '\\') {
                 next();
                 if (c == 'u') {