You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2012/10/31 19:11:28 UTC
git commit: guard against npe on error condition
Updated Branches:
refs/heads/trunk 353309f01 -> 6516eba92
guard against npe on error condition
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6516eba9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6516eba9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6516eba9
Branch: refs/heads/trunk
Commit: 6516eba92e893f86c367b89f5c9291a9393deb52
Parents: 353309f
Author: Dave Brosius <db...@apache.org>
Authored: Wed Oct 31 14:10:58 2012 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Wed Oct 31 14:10:58 2012 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/Shuffle.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6516eba9/src/java/org/apache/cassandra/tools/Shuffle.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/Shuffle.java b/src/java/org/apache/cassandra/tools/Shuffle.java
index 34da8f0..70b747d 100644
--- a/src/java/org/apache/cassandra/tools/Shuffle.java
+++ b/src/java/org/apache/cassandra/tools/Shuffle.java
@@ -496,7 +496,8 @@ public class Shuffle extends AbstractJmxClient
}
finally
{
- client.close();
+ if (client != null)
+ client.close();
}
}