git commit: fix cast guard to be of the c* FutureTask type

2014-05-30 Thread dbrosius
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 e56a64edb - f66689db9


fix cast guard to be of the c* FutureTask type


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f66689db
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f66689db
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f66689db

Branch: refs/heads/cassandra-2.1
Commit: f66689db9705fe5ebb0a6d2fe5063e23b0c2af0c
Parents: e56a64e
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Fri May 30 23:54:17 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Fri May 30 23:54:17 2014 -0400

--
 .../cassandra/concurrent/AbstractTracingAwareExecutorService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f66689db/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
--
diff --git 
a/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
 
b/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
index 544e8a7..95c55d3 100644
--- 
a/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
+++ 
b/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
@@ -105,7 +105,7 @@ public abstract class AbstractTracingAwareExecutorService 
implements TracingAwar
 return (TraceSessionFutureTaskT) callable;
 return new TraceSessionFutureTaskT(callable, null);
 }
-if (callable instanceof java.util.concurrent.FutureTask)
+if (callable instanceof FutureTask)
 return (FutureTaskT) callable;
 return new FutureTask(callable);
 }



[1/2] git commit: fix cast guard to be of the c* FutureTask type

2014-05-30 Thread dbrosius
Repository: cassandra
Updated Branches:
  refs/heads/trunk ce248f227 - 91ea6da10


fix cast guard to be of the c* FutureTask type


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f66689db
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f66689db
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f66689db

Branch: refs/heads/trunk
Commit: f66689db9705fe5ebb0a6d2fe5063e23b0c2af0c
Parents: e56a64e
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Fri May 30 23:54:17 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Fri May 30 23:54:17 2014 -0400

--
 .../cassandra/concurrent/AbstractTracingAwareExecutorService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f66689db/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
--
diff --git 
a/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
 
b/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
index 544e8a7..95c55d3 100644
--- 
a/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
+++ 
b/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
@@ -105,7 +105,7 @@ public abstract class AbstractTracingAwareExecutorService 
implements TracingAwar
 return (TraceSessionFutureTaskT) callable;
 return new TraceSessionFutureTaskT(callable, null);
 }
-if (callable instanceof java.util.concurrent.FutureTask)
+if (callable instanceof FutureTask)
 return (FutureTaskT) callable;
 return new FutureTask(callable);
 }