merge from 0.8

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1154242 13f79535-47bb-0310-9956-ffa450edef68
yuanhui-yang · Aug 5, 2011 · 3199735 · 3199735
1 parent 784e5b5
commit 3199735
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -28,6 +28,10 @@
  * add scheduler JMX metrics (CASSANDRA-2962)
 
 
+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)
@@ -64,7 +68,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

diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -291,6 +291,10 @@ else if (conf.memtable_flush_writers == null)
                     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");

diff --git a/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java b/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
@@ -124,12 +124,6 @@ protected void setup() throws IOException
 
         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()
         {

diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
@@ -451,10 +451,7 @@ private void joinTokenRing() throws IOException, org.apache.cassandra.config.Con
         Gossiper.instance.register(migrationManager);
         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();