merge default into v1_5_1

All the changes made on 'default' so far should go into v1_5_1. Which
is lucky since we don't have to cherry pick.

Author: Matthias Radestock

build.properties

@@ -16,3 +16,4 @@ sibling.codegen.dir=../rabbitmq-codegen/
 spec.version=0.8
 bundle.out=${build.out}/bundle/com/rabbitmq/amqp-client/${impl.version}/
 javadoc.out=build/doc/api
+python.bin=python

build.xml

@@ -44,7 +44,7 @@
   <target name="amqp-generate" depends="amqp-generate-check"
     unless="amqp.generate.notRequired" description="generate AMQP.java and AMQImpl.java from AMQP spec">
     <mkdir dir="${src.generated}/com/rabbitmq/client/"/>
-    <exec dir="." executable="python"
+    <exec dir="." executable="${python.bin}"
           output="${src.generated}/com/rabbitmq/client/AMQP.java"
     	  errorproperty="amqp.generate.error1"
           resultproperty="amqp.generate.result1">
@@ -60,7 +60,7 @@
         </condition>
     </fail>
     <mkdir dir="${src.generated}/com/rabbitmq/client/impl"/>
-    <exec dir="." executable="python"
+    <exec dir="." executable="${python.bin}"
           output="${src.generated}/com/rabbitmq/client/impl/AMQImpl.java"
           errorproperty="amqp.generate.error2"
           resultproperty="amqp.generate.result2">

test/src/com/rabbitmq/client/test/functional/Routing.java

@@ -144,6 +144,26 @@ public void testFanoutRouting() throws Exception {
         }
     }
 
+    public void testTopicRouting() throws Exception {
+
+        List<String> queues = new ArrayList<String>();
+
+        //100+ queues is the trigger point for bug20046
+        for (int i = 0; i < 100; i++) {
+            channel.queueDeclare();
+            AMQP.Queue.DeclareOk ok = channel.queueDeclare();
+            String q = ok.getQueue();
+            channel.queueBind(q, "amq.topic", "#");
+            queues.add(q);
+        }
+
+        channel.basicPublish("amq.topic", "", null, "topic".getBytes());
+
+        for (String q : queues) {
+            checkGet(q, true);
+        }
+    }
+
     public void testUnbind() throws Exception {
         AMQP.Queue.DeclareOk ok = channel.queueDeclare();
         String queue = ok.getQueue();