Use Collections.emptyMap() in ValueReader for empty maps;

remove commented out line;
eliminate some generic warnings from cmpiler.

Author: Steve Powell

codegen.py

@@ -305,6 +305,7 @@ def printClassProperties(c):
     for c in spec.classes:
         if c.hasContentProperties:
             printClassProperties(c)
+
     print "}"
 
 #--------------------------------------------------------------------------------

src/com/rabbitmq/client/RpcServer.java

@@ -141,12 +141,14 @@ public void processRequest(QueueingConsumer.Delivery request)
         throws IOException
     {
         AMQP.BasicProperties requestProperties = request.getProperties();
-        if (requestProperties.getCorrelationId() != null && requestProperties.getReplyTo() != null)
+        String correlationId = requestProperties.getCorrelationId();
+        String replyTo = requestProperties.getReplyTo();
+        if (correlationId != null && replyTo != null)
         {
             AMQP.BasicProperties replyProperties = new AMQP.BasicProperties();
             byte[] replyBody = handleCall(request, replyProperties);
-            replyProperties.setCorrelationId(requestProperties.getCorrelationId());
-            _channel.basicPublish("", requestProperties.getReplyTo(),
+            replyProperties.setCorrelationId(correlationId);
+            _channel.basicPublish("", replyTo,
                                   replyProperties, replyBody);
         } else {
             handleCast(request);

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

@@ -146,7 +146,6 @@ public void ensureIsOpen()
     private int _heartbeat;
 
     private final String _virtualHost;
-//    private final int _requestedChannelMax, _requestedFrameMax, _requestedHeartbeat;
     private final Map<String, Object> _clientProperties;
 
     /** Saved server properties field from connection.start */

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

@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -146,9 +147,10 @@ public final long readLonglong()
     public static final Map<String, Object> readTable(DataInputStream in)
         throws IOException
     {
-        Map<String, Object> table = new HashMap<String, Object>();
         long tableLength = unsignedExtend(in.readInt());
-
+        if (tableLength == 0) return Collections.emptyMap();
+        
+        Map<String, Object> table = new HashMap<String, Object>();
         DataInputStream tableIn = new DataInputStream
             (new TruncatedInputStream(in, tableLength));
         while(tableIn.available() > 0) {
@@ -217,13 +219,13 @@ public static final Object readFieldValue(DataInputStream in)
     }
 
     /** Read a field-array */
-    public static List readArray(DataInputStream in)
+    public static List<Object> readArray(DataInputStream in)
         throws IOException
     {
         long length = unsignedExtend(in.readInt());
         DataInputStream arrayIn = new DataInputStream
             (new TruncatedInputStream(in, length));
-        List array = new ArrayList();
+        List<Object> array = new ArrayList<Object>();
         while(arrayIn.available() > 0) {
             Object value = readFieldValue(arrayIn);
             array.add(value);