More specific ConnectionParams field name

michaelklishin · michaelklishin · commit f6b969e0b466 · 2015-09-18T17:11:42.000+03:00
diff --git a/src/com/rabbitmq/client/ConnectionFactory.java b/src/com/rabbitmq/client/ConnectionFactory.java
@@ -664,12 +664,12 @@ public Connection newConnection(ExecutorService executor, Address[] addrs)
         }
     }
 
-    public ConnectionParams params(ExecutorService executor) {
+    public ConnectionParams params(ExecutorService consumerWorkServiceExecutor) {
         ConnectionParams result = new ConnectionParams();
 
         result.setUsername(username);
         result.setPassword(password);
-        result.setExecutor(executor);
+        result.setConsumerWorkServiceExecutor(consumerWorkServiceExecutor);
         result.setVirtualHost(virtualHost);
         result.setClientProperties(getClientProperties());
         result.setRequestedFrameMax(requestedFrameMax);
diff --git a/src/com/rabbitmq/client/impl/AMQConnection.java b/src/com/rabbitmq/client/impl/AMQConnection.java
@@ -220,7 +220,7 @@ public AMQConnection(ConnectionParams params, FrameHandler frameHandler)
         this.handshakeTimeout = params.getHandshakeTimeout();
         this.shutdownTimeout = params.getShutdownTimeout();
         this.saslConfig = params.getSaslConfig();
-        this.executor = params.getExecutor();
+        this.executor = params.getConsumerWorkServiceExecutor();
         this.threadFactory = params.getThreadFactory();
 
         this._channelManager = null;
diff --git a/src/com/rabbitmq/client/impl/ConnectionParams.java b/src/com/rabbitmq/client/impl/ConnectionParams.java
@@ -10,7 +10,7 @@
 public class ConnectionParams {
     private String username;
     private String password;
-    private ExecutorService executor;
+    private ExecutorService consumerWorkServiceExecutor;
     private String virtualHost;
     private Map<String, Object> clientProperties;
     private int requestedFrameMax;
@@ -35,8 +35,8 @@ public String getPassword() {
         return password;
     }
 
-    public ExecutorService getExecutor() {
-        return executor;
+    public ExecutorService getConsumerWorkServiceExecutor() {
+        return consumerWorkServiceExecutor;
     }
 
     public String getVirtualHost() {
@@ -99,8 +99,8 @@ public void setPassword(String password) {
         this.password = password;
     }
 
-    public void setExecutor(ExecutorService executor) {
-        this.executor = executor;
+    public void setConsumerWorkServiceExecutor(ExecutorService consumerWorkServiceExecutor) {
+        this.consumerWorkServiceExecutor = consumerWorkServiceExecutor;
     }
 
     public void setVirtualHost(String virtualHost) {

Original file line number	Diff line number	Diff line change
`@@ -664,12 +664,12 @@ public Connection newConnection(ExecutorService executor, Address[] addrs)`
`664`	`664`	`}`
`665`	`665`	`}`
`666`	`666`
`667`		`- public ConnectionParams params(ExecutorService executor) {`
	`667`	`+ public ConnectionParams params(ExecutorService consumerWorkServiceExecutor) {`
`668`	`668`	`ConnectionParams result = new ConnectionParams();`
`669`	`669`
`670`	`670`	`result.setUsername(username);`
`671`	`671`	`result.setPassword(password);`
`672`		`- result.setExecutor(executor);`
	`672`	`+ result.setConsumerWorkServiceExecutor(consumerWorkServiceExecutor);`
`673`	`673`	`result.setVirtualHost(virtualHost);`
`674`	`674`	`result.setClientProperties(getClientProperties());`
`675`	`675`	`result.setRequestedFrameMax(requestedFrameMax);`