You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/04/28 15:32:11 UTC
incubator-nifi git commit: peerStatus to peerDescription in
EndpointConnectionPool.java fixing incompatible type error
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 6c3256e00 -> 6e492b408
peerStatus to peerDescription in EndpointConnectionPool.java fixing incompatible type error
Signed-off-by: Mark Payne <ma...@hotmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/6e492b40
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/6e492b40
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/6e492b40
Branch: refs/heads/develop
Commit: 6e492b408233f032087d3294111cc646b443db51
Parents: 6c3256e
Author: Mark Latimer <ma...@gmail.com>
Authored: Mon Apr 27 20:52:54 2015 +0100
Committer: Mark Payne <ma...@hotmail.com>
Committed: Tue Apr 28 09:31:51 2015 -0400
----------------------------------------------------------------------
.../apache/nifi/remote/client/socket/EndpointConnectionPool.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6e492b40/nifi/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/socket/EndpointConnectionPool.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/socket/EndpointConnectionPool.java b/nifi/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/socket/EndpointConnectionPool.java
index 36d8bac..b162b3f 100644
--- a/nifi/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/socket/EndpointConnectionPool.java
+++ b/nifi/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/socket/EndpointConnectionPool.java
@@ -258,7 +258,7 @@ public class EndpointConnectionPool {
}
final PeerDescription peerDescription = peerStatus.getPeerDescription();
- BlockingQueue<EndpointConnection> connectionQueue = connectionQueueMap.get(peerStatus);
+ BlockingQueue<EndpointConnection> connectionQueue = connectionQueueMap.get(peerDescription);
if (connectionQueue == null) {
connectionQueue = new LinkedBlockingQueue<>();
BlockingQueue<EndpointConnection> existing = connectionQueueMap.putIfAbsent(peerDescription, connectionQueue);