From 82e3b15f48e77555a69a7f6564ec2dca7841c1e0 Mon Sep 17 00:00:00 2001 From: Philip Thompson Date: Mon, 29 Jun 2015 17:43:11 -0400 Subject: [PATCH] Remove check for ccm-281. Fixed upstream. --- .../test/java/com/datastax/driver/core/CCMBridge.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java b/driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java index 0a807fe4da0..97da0181f5c 100644 --- a/driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java +++ b/driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java @@ -191,33 +191,24 @@ private static File createTempStore(String storePath) { } public static CCMBridge create(String name, String... options) { - // This leads to a confusing CCM error message so check explicitly: - checkArgument(!"current".equals(name.toLowerCase()), - "cluster can't be called \"current\""); CCMBridge bridge = new CCMBridge(); bridge.execute(CCM_COMMAND + " create %s -b -i %s %s " + Joiner.on(" ").join(options), name, IP_PREFIX, CASSANDRA_VERSION); return bridge; } public static CCMBridge create(String name, int nbNodes, String... options) { - checkArgument(!"current".equals(name.toLowerCase()), - "cluster can't be called \"current\""); CCMBridge bridge = new CCMBridge(); bridge.execute(CCM_COMMAND + " create %s -n %d -s -i %s -b %s " + Joiner.on(" ").join(options), name, nbNodes, IP_PREFIX, CASSANDRA_VERSION); return bridge; } public static CCMBridge createWithCustomVersion(String name, int nbNodes, String cassandraVersion) { - checkArgument(!"current".equals(name.toLowerCase()), - "cluster can't be called \"current\""); CCMBridge bridge = new CCMBridge(); bridge.execute(CCM_COMMAND + " create %s -n %d -s -i %s -b -v %s ", name, nbNodes, IP_PREFIX, cassandraVersion); return bridge; } public static CCMBridge create(String name, int nbNodesDC1, int nbNodesDC2) { - checkArgument(!"current".equals(name.toLowerCase()), - "cluster can't be called \"current\""); CCMBridge bridge = new CCMBridge(); bridge.execute(CCM_COMMAND + " create %s -n %d:%d -s -i %s -b %s", name, nbNodesDC1, nbNodesDC2, IP_PREFIX, CASSANDRA_VERSION); return bridge;