Merge pull request #146 from 2sbsbsb/master

michaelklishin · web-flow · commit bfc62e1d9f7a · 2017-09-13T17:02:56.000-04:00
Request to pull with minor improvement
diff --git a/java/RPCServer.java b/java/RPCServer.java
@@ -26,7 +26,7 @@ public static void main(String[] argv) {
     Connection connection = null;
     try {
       connection      = factory.newConnection();
-      Channel channel = connection.createChannel();
+      final Channel channel = connection.createChannel();
 
       channel.queueDeclare(RPC_QUEUE_NAME, false, false, false, null);
 
@@ -56,19 +56,25 @@ public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProp
           }
           finally {
             channel.basicPublish( "", properties.getReplyTo(), replyProps, response.getBytes("UTF-8"));
-
             channel.basicAck(envelope.getDeliveryTag(), false);
+            // RabbitMq consumer worker thread notifies the RPC server owner thread 
+            synchronized(this) {
+            	this.notify();
+            }
           }
         }
       };
 
       channel.basicConsume(RPC_QUEUE_NAME, false, consumer);
-
-      //loop to prevent reaching finally block
-      while(true) {
-        try {
-          Thread.sleep(100);
-        } catch (InterruptedException _ignore) {}
+      // Wait and be prepared to consume the message from RPC client.
+      while (true) {
+      	synchronized(consumer) {
+      		try {
+      			consumer.wait();
+      	    } catch (InterruptedException e) {
+      	    	e.printStackTrace();	    	
+      	    }
+      	}
       }
     } catch (IOException | TimeoutException e) {
       e.printStackTrace();
