Author: slebresne
Date: Fri Aug 5 13:59:54 2011
New Revision: 1154219
URL: http://svn.apache.org/viewvc?rev=1154219&view=rev
Log:
Fix NPE in getRangeToRpcaddressMap
patch by slebresne; reviewed by jbellis for CASSANDRA-2996
Modified:
cassandra/branches/cassandra-0.8/CHANGES.txt
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java
Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1154219&r1=1154218&r2=1154219&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Fri Aug 5 13:59:54 2011
@@ -1,3 +1,6 @@
+0.8.4
+ * include files-to-be-streamed in StreamInSession.getSources (CASSANDRA-2972)
+
0.8.3
* add ability to drop local reads/writes that are going to timeout
(CASSANDRA-2943)
@@ -34,7 +37,6 @@
* add asynchronous and half-sync/half-async thrift servers (CASSANDRA-1405)
* fix potential use of free'd native memory in SerializingCache
(CASSANDRA-2951)
- * include files-to-be-streamed in StreamInSession.getSources (CASSANDRA-2972)
0.8.2
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=1154219&r1=1154218&r2=1154219&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Fri Aug 5 13:59:54 2011
@@ -274,6 +274,10 @@ public class DatabaseDescriptor
throw new ConfigurationException("Unknown host in
rpc_address " + conf.rpc_address);
}
}
+ else
+ {
+ rpcAddress = FBUtilities.getLocalAddress();
+ }
if (conf.thrift_framed_transport_size_in_mb <= 0)
throw new
ConfigurationException("thrift_framed_transport_size_in_mb must be positive");
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java?rev=1154219&r1=1154218&r2=1154219&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
Fri Aug 5 13:59:54 2011
@@ -125,12 +125,6 @@ public abstract class AbstractCassandraD
listenPort = DatabaseDescriptor.getRpcPort();
listenAddr = DatabaseDescriptor.getRpcAddress();
- /*
- * If ThriftAddress was left completely unconfigured, then assume
- * the same default as ListenAddress
- */
- if (listenAddr == null)
- listenAddr = FBUtilities.getLocalAddress();
Thread.setDefaultUncaughtExceptionHandler(new
Thread.UncaughtExceptionHandler()
{
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java?rev=1154219&r1=1154218&r2=1154219&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java
Fri Aug 5 13:59:54 2011
@@ -452,10 +452,7 @@ public class StorageService implements I
Gossiper.instance.start(SystemTable.incrementAndGetGeneration()); //
needed for node-ring gathering.
// add rpc listening info
- if (DatabaseDescriptor.getRpcAddress() == null)
-
Gossiper.instance.addLocalApplicationState(ApplicationState.RPC_ADDRESS,
valueFactory.rpcaddress(FBUtilities.getLocalAddress()));
- else
-
Gossiper.instance.addLocalApplicationState(ApplicationState.RPC_ADDRESS,
valueFactory.rpcaddress(DatabaseDescriptor.getRpcAddress()));
+
Gossiper.instance.addLocalApplicationState(ApplicationState.RPC_ADDRESS,
valueFactory.rpcaddress(DatabaseDescriptor.getRpcAddress()));
MessagingService.instance().listen(FBUtilities.getLocalAddress());
StorageLoadBalancer.instance.startBroadcasting();
