Repository: cassandra Updated Branches: refs/heads/trunk 58985409c -> e4e6e907c
remove orphanable field 'connectionFactory' Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4e6e907 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4e6e907 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4e6e907 Branch: refs/heads/trunk Commit: e4e6e907c856f17d927e19e2ff22c99f9f3bf7d9 Parents: 5898540 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sun Sep 14 20:35:43 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sun Sep 14 20:35:43 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/streaming/StreamPlan.java | 4 +--- src/java/org/apache/cassandra/utils/Hex.java | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4e6e907/src/java/org/apache/cassandra/streaming/StreamPlan.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/StreamPlan.java b/src/java/org/apache/cassandra/streaming/StreamPlan.java index f7b6203..ca448a3 100644 --- a/src/java/org/apache/cassandra/streaming/StreamPlan.java +++ b/src/java/org/apache/cassandra/streaming/StreamPlan.java @@ -38,8 +38,6 @@ public class StreamPlan private final long repairedAt; private final StreamCoordinator coordinator; - private StreamConnectionFactory connectionFactory = new DefaultConnectionFactory(); - private boolean flushBeforeTransfer = true; /** @@ -56,7 +54,7 @@ public class StreamPlan { this.description = description; this.repairedAt = repairedAt; - this.coordinator = new StreamCoordinator(connectionsPerHost, connectionFactory); + this.coordinator = new StreamCoordinator(connectionsPerHost, new DefaultConnectionFactory()); } /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4e6e907/src/java/org/apache/cassandra/utils/Hex.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/Hex.java b/src/java/org/apache/cassandra/utils/Hex.java index 5ba0b1a..13daa43 100644 --- a/src/java/org/apache/cassandra/utils/Hex.java +++ b/src/java/org/apache/cassandra/utils/Hex.java @@ -118,9 +118,9 @@ public class Hex * @return Constructor if successful, null if the constructor cannot be * accessed */ - public static Constructor getProtectedConstructor(Class klass, Class... paramTypes) + public static <T> Constructor<T> getProtectedConstructor(Class<T> klass, Class<?>... paramTypes) { - Constructor c; + Constructor<T> c; try { c = klass.getDeclaredConstructor(paramTypes);
