Repository: cassandra Updated Branches: refs/heads/trunk 88b7126a1 -> 95c4320ba
avoid chance of NPEs while generating informational strings Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95c4320b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95c4320b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95c4320b Branch: refs/heads/trunk Commit: 95c4320baf468c32085676607521e0f33410c351 Parents: 88b7126 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed Dec 28 14:51:07 2016 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed Dec 28 14:51:07 2016 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cache/AutoSavingCache.java | 2 +- src/java/org/apache/cassandra/cache/ChunkCache.java | 2 +- src/java/org/apache/cassandra/cql3/functions/UDHelper.java | 2 +- .../org/apache/cassandra/io/util/BufferManagingRebufferer.java | 2 +- src/java/org/apache/cassandra/io/util/LimitingRebufferer.java | 2 +- src/java/org/apache/cassandra/io/util/RandomAccessReader.java | 2 +- src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 2 +- src/java/org/apache/cassandra/service/ActiveRepairService.java | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95c4320b/src/java/org/apache/cassandra/cache/AutoSavingCache.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cache/AutoSavingCache.java b/src/java/org/apache/cassandra/cache/AutoSavingCache.java index aa13ca3..b7616b9 100644 --- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java +++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java @@ -201,7 +201,7 @@ public class AutoSavingCache<K extends CacheKey, V> extends InstrumentingCache<K UUID schemaVersion = new UUID(in.readLong(), in.readLong()); if (!schemaVersion.equals(Schema.instance.getVersion())) throw new RuntimeException("Cache schema version " - + schemaVersion.toString() + + schemaVersion + " does not match current schema version " + Schema.instance.getVersion()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/95c4320b/src/java/org/apache/cassandra/cache/ChunkCache.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cache/ChunkCache.java b/src/java/org/apache/cassandra/cache/ChunkCache.java index 15cf2ce..7e5b9e1 100644 --- a/src/java/org/apache/cassandra/cache/ChunkCache.java +++ b/src/java/org/apache/cassandra/cache/ChunkCache.java @@ -289,7 +289,7 @@ public class ChunkCache @Override public String toString() { - return "CachingRebufferer:" + source.toString(); + return "CachingRebufferer:" + source; } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/95c4320b/src/java/org/apache/cassandra/cql3/functions/UDHelper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/functions/UDHelper.java b/src/java/org/apache/cassandra/cql3/functions/UDHelper.java index ddeae41..935b1b8 100644 --- a/src/java/org/apache/cassandra/cql3/functions/UDHelper.java +++ b/src/java/org/apache/cassandra/cql3/functions/UDHelper.java @@ -159,7 +159,7 @@ public final class UDHelper public static ByteBuffer serialize(TypeCodec<?> codec, ProtocolVersion protocolVersion, Object value) { if (!codec.getJavaType().getRawType().isAssignableFrom(value.getClass())) - throw new InvalidTypeException("Invalid value for CQL type " + codec.getCqlType().getName().toString()); + throw new InvalidTypeException("Invalid value for CQL type " + codec.getCqlType().getName()); return ((TypeCodec)codec).serialize(value, com.datastax.driver.core.ProtocolVersion.fromInt(protocolVersion.asInt())); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/95c4320b/src/java/org/apache/cassandra/io/util/BufferManagingRebufferer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/util/BufferManagingRebufferer.java b/src/java/org/apache/cassandra/io/util/BufferManagingRebufferer.java index 1648bcf..f3b9a88 100644 --- a/src/java/org/apache/cassandra/io/util/BufferManagingRebufferer.java +++ b/src/java/org/apache/cassandra/io/util/BufferManagingRebufferer.java @@ -89,7 +89,7 @@ public abstract class BufferManagingRebufferer implements Rebufferer, Rebufferer @Override public String toString() { - return "BufferManagingRebufferer." + getClass().getSimpleName() + ":" + source.toString(); + return "BufferManagingRebufferer." + getClass().getSimpleName() + ":" + source; } // BufferHolder methods http://git-wip-us.apache.org/repos/asf/cassandra/blob/95c4320b/src/java/org/apache/cassandra/io/util/LimitingRebufferer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/util/LimitingRebufferer.java b/src/java/org/apache/cassandra/io/util/LimitingRebufferer.java index a1e9715..b5c7f34 100644 --- a/src/java/org/apache/cassandra/io/util/LimitingRebufferer.java +++ b/src/java/org/apache/cassandra/io/util/LimitingRebufferer.java @@ -101,7 +101,7 @@ public class LimitingRebufferer implements Rebufferer, Rebufferer.BufferHolder @Override public String toString() { - return "LimitingRebufferer[" + limiter.toString() + "]:" + wrapped.toString(); + return "LimitingRebufferer[" + limiter + "]:" + wrapped; } // BufferHolder methods http://git-wip-us.apache.org/repos/asf/cassandra/blob/95c4320b/src/java/org/apache/cassandra/io/util/RandomAccessReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/util/RandomAccessReader.java b/src/java/org/apache/cassandra/io/util/RandomAccessReader.java index 5157eac..a0ea520 100644 --- a/src/java/org/apache/cassandra/io/util/RandomAccessReader.java +++ b/src/java/org/apache/cassandra/io/util/RandomAccessReader.java @@ -169,7 +169,7 @@ public class RandomAccessReader extends RebufferingInputStream implements FileDa @Override public String toString() { - return getClass().getSimpleName() + ':' + rebufferer.toString(); + return getClass().getSimpleName() + ':' + rebufferer; } /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/95c4320b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java index 15730c3..ee0974f 100644 --- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java +++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java @@ -1074,7 +1074,7 @@ public final class SchemaKeyspace ? ColumnDefinition.Kind.valueOf(row.getString("kind").toUpperCase()) : ColumnDefinition.Kind.REGULAR; assert kind == ColumnDefinition.Kind.REGULAR || kind == ColumnDefinition.Kind.STATIC - : "Unexpected dropped column kind: " + kind.toString(); + : "Unexpected dropped column kind: " + kind; return new CFMetaData.DroppedColumn(name, type, droppedTime, kind); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/95c4320b/src/java/org/apache/cassandra/service/ActiveRepairService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/ActiveRepairService.java b/src/java/org/apache/cassandra/service/ActiveRepairService.java index b47c488..1e89c8b 100644 --- a/src/java/org/apache/cassandra/service/ActiveRepairService.java +++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java @@ -333,13 +333,13 @@ public class ActiveRepairService implements IEndpointStateChangeSubscriber, IFai catch (InterruptedException e) { removeParentRepairSession(parentRepairSession); - throw new RuntimeException("Did not get replies from all endpoints. List of failed endpoint(s): " + failedNodes.toString(), e); + throw new RuntimeException("Did not get replies from all endpoints. List of failed endpoint(s): " + failedNodes, e); } if (!status.get()) { removeParentRepairSession(parentRepairSession); - throw new RuntimeException("Did not get positive replies from all endpoints. List of failed endpoint(s): " + failedNodes.toString()); + throw new RuntimeException("Did not get positive replies from all endpoints. List of failed endpoint(s): " + failedNodes); } return parentRepairSession;