fixing leftovers from bug21283

Author: Vlad Ionescu

src/com/rabbitmq/client/RpcClient.java

@@ -147,7 +147,7 @@ public void handleDelivery(String consumerTag,
                                        byte[] body)
                     throws IOException {
                 synchronized (_continuationMap) {
-                    String replyId = properties.correlationId;
+                    String replyId = properties.getCorrelationId();
                     BlockingCell<Object> blocker = _continuationMap.get(replyId);
                     _continuationMap.remove(replyId);
                     blocker.set(body);
@@ -173,8 +173,8 @@ public byte[] primitiveCall(AMQP.BasicProperties props, byte[] message)
             _correlationId++;
             String replyId = "" + _correlationId;
             if (props != null) {
-                props.correlationId = replyId;
-                props.replyTo = _replyQueue;
+                props.setCorrelationId(replyId);
+                props.setReplyTo(_replyQueue);
             }
             else {
                 props = new AMQP.BasicProperties(null, null, null, null,

src/com/rabbitmq/client/RpcServer.java

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

src/com/rabbitmq/tools/jsonrpc/JsonRpcServer.java

@@ -114,7 +114,7 @@ public JsonRpcServer(Channel channel,
      */
     public String handleStringCall(String requestBody, AMQP.BasicProperties replyProperties)
     {
-        replyProperties.contentType = "application/json";
+        replyProperties.setContentType("application/json");
         String replyBody = doCall(requestBody);
         //System.err.println(requestBody + " --> " + replyBody);
         return replyBody;