You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/01/16 17:51:16 UTC
[1/3] git commit: cleanup
cleanup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/994d2625
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/994d2625
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/994d2625
Branch: refs/heads/cassandra-1.2
Commit: 994d2625b1eb40ded5da310f3080ce1a2d5d2ba3
Parents: 1108ede
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jan 15 22:43:35 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Jan 16 08:51:02 2013 -0800
----------------------------------------------------------------------
.../cassandra/config/DatabaseDescriptor.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/994d2625/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 88c4e38..c9b2d1e 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -128,7 +128,7 @@ public class DatabaseDescriptor
{
URL url = getStorageConfigURL();
logger.info("Loading settings from " + url);
- InputStream input = null;
+ InputStream input;
try
{
input = url.openStream();
@@ -206,7 +206,7 @@ public class DatabaseDescriptor
/* Authentication and authorization backend, implementing IAuthenticator and IAuthorizer */
if (conf.authenticator != null)
- authenticator = FBUtilities.<IAuthenticator>construct(conf.authenticator, "authenticator");
+ authenticator = FBUtilities.construct(conf.authenticator, "authenticator");
if (conf.authority != null)
{
@@ -217,7 +217,7 @@ public class DatabaseDescriptor
}
if (conf.authorizer != null)
- authorizer = FBUtilities.<IAuthorizer>construct(conf.authorizer, "authorizer");
+ authorizer = FBUtilities.construct(conf.authorizer, "authorizer");
authenticator.validateConfiguration();
authorizer.validateConfiguration();