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 2014/05/03 22:42:58 UTC
[1/3] git commit: fix npe if configURL is null (new URL(null) throws)
Repository: cassandra
Updated Branches:
refs/heads/trunk 2b674656e -> 848494d5f
fix npe if configURL is null (new URL(null) throws)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3fb2dcdf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3fb2dcdf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3fb2dcdf
Branch: refs/heads/trunk
Commit: 3fb2dcdf06fa74db14891abb76a447c040f32436
Parents: 3047ab6
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat May 3 16:39:16 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat May 3 16:39:16 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/locator/SnitchProperties.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fb2dcdf/src/java/org/apache/cassandra/locator/SnitchProperties.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/SnitchProperties.java b/src/java/org/apache/cassandra/locator/SnitchProperties.java
index 52268da..36fec7f 100644
--- a/src/java/org/apache/cassandra/locator/SnitchProperties.java
+++ b/src/java/org/apache/cassandra/locator/SnitchProperties.java
@@ -38,9 +38,12 @@ public class SnitchProperties
String configURL = System.getProperty(RACKDC_PROPERTY_FILENAME);
try
{
- URL url = new URL(configURL);
+ URL url;
if (configURL == null)
url = SnitchProperties.class.getClassLoader().getResource(RACKDC_PROPERTY_FILENAME);
+ else
+ url = new URL(configURL);
+
stream = url.openStream(); // catch block handles potential NPE
properties.load(stream);
}
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by db...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/38a48b12
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/38a48b12
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/38a48b12
Branch: refs/heads/trunk
Commit: 38a48b1238fb57278b87215ff7046daf7f49920d
Parents: b53442b 3fb2dcd
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat May 3 16:40:14 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat May 3 16:40:14 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/locator/SnitchProperties.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/38a48b12/src/java/org/apache/cassandra/locator/SnitchProperties.java
----------------------------------------------------------------------
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/848494d5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/848494d5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/848494d5
Branch: refs/heads/trunk
Commit: 848494d5f5a0eadb74582d5edaac834f500aa203
Parents: 2b67465 38a48b1
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat May 3 16:40:57 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat May 3 16:40:57 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/locator/SnitchProperties.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------