Merged default into 18557

Author: 0x6e6562

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,13 +44,13 @@
   <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"
-          output="${src.generated}/com/rabbitmq/client/AMQP.java"
+    <exec dir="." executable="${python.bin}"
     	  errorproperty="amqp.generate.error1"
           resultproperty="amqp.generate.result1">
       <arg line="codegen.py"/>
       <arg line="header"/>
       <arg line="${AMQP_SPEC_JSON_PATH}"/>
+      <arg line="${src.generated}/com/rabbitmq/client/AMQP.java"/>
     </exec>
   	<fail message="Generation of AMQP.java failed with message:${line.separator}${amqp.generate.error1}">
         <condition>
@@ -60,13 +60,13 @@
         </condition>
     </fail>
     <mkdir dir="${src.generated}/com/rabbitmq/client/impl"/>
-    <exec dir="." executable="python"
-          output="${src.generated}/com/rabbitmq/client/impl/AMQImpl.java"
+    <exec dir="." executable="${python.bin}"
           errorproperty="amqp.generate.error2"
           resultproperty="amqp.generate.result2">
       <arg line="codegen.py"/>
       <arg line="body"/>
       <arg line="${AMQP_SPEC_JSON_PATH}"/>
+      <arg line="${src.generated}/com/rabbitmq/client/impl/AMQImpl.java"/>
     </exec>
   	<fail message="Generation of AMQPImpl.java failed with message:${line.separator}${amqp.generate.error2}">
         <condition>

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();