cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [1/2] cassandra git commit: ninja-fix javac warning
Date Mon, 16 Nov 2015 16:45:42 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.1 b3231e963 -> 36e767714


ninja-fix javac warning


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

Branch: refs/heads/cassandra-3.1
Commit: c0480d8bbddf111e4cd7c67ef7c0daeec3ece2dc
Parents: c2320c9
Author: Robert Stupp <snazy@snazy.de>
Authored: Mon Nov 16 17:39:13 2015 +0100
Committer: Robert Stupp <snazy@snazy.de>
Committed: Mon Nov 16 17:39:13 2015 +0100

----------------------------------------------------------------------
 .../cassandra/cql3/validation/operations/AggregationTest.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0480d8b/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
b/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
index 1a532ac..a1fb68b 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
@@ -1371,7 +1371,7 @@ public class AggregationTest extends CQLTester
                                              "INITCOND null");
 
         assertRows(execute("SELECT initcond FROM system_schema.aggregates WHERE keyspace_name=?
AND aggregate_name=?", KEYSPACE, shortFunctionName(aggregation)),
-                   row(null));
+                   row((Object) null));
 
         assertRows(execute("SELECT " + aggregation + "(b) FROM %s"),
                    row(set(7, 8, 9)));


Mime
View raw message