cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [3/3] git commit: Start binary protocol server before thrift (as the later is too damn long to start)
Date Tue, 13 Nov 2012 19:13:22 GMT
Start binary protocol server before thrift (as the later is too damn long to start)


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91a10fa5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91a10fa5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91a10fa5

Branch: refs/heads/cassandra-1.2
Commit: 91a10fa58e0218739e09498c2d90fa858cea85d6
Parents: 9c5e5dc
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Nov 13 20:10:50 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Nov 13 20:10:50 2012 +0100

----------------------------------------------------------------------
 .../apache/cassandra/service/CassandraDaemon.java  |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/91a10fa5/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 03da7e3..687ddaa 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -346,17 +346,17 @@ public class CassandraDaemon
      */
     public void start()
     {
-        String rpcFlag = System.getProperty("cassandra.start_rpc");
-        if ((rpcFlag != null && Boolean.parseBoolean(rpcFlag)) || (rpcFlag == null
&& DatabaseDescriptor.startRpc()))
-            thriftServer.start();
-        else
-            logger.info("Not starting RPC server as requested. Use JMX (StorageService->startRPCServer())
to start it");
-
         String nativeFlag = System.getProperty("cassandra.start_native_transport");
         if ((nativeFlag != null && Boolean.parseBoolean(nativeFlag)) || (nativeFlag
== null && DatabaseDescriptor.startNativeTransport()))
             nativeServer.start();
         else
             logger.info("Not starting native transport as requested. Use JMX (StorageService->startNativeTransport())
to start it");
+
+        String rpcFlag = System.getProperty("cassandra.start_rpc");
+        if ((rpcFlag != null && Boolean.parseBoolean(rpcFlag)) || (rpcFlag == null
&& DatabaseDescriptor.startRpc()))
+            thriftServer.start();
+        else
+            logger.info("Not starting RPC server as requested. Use JMX (StorageService->startRPCServer())
to start it");
     }
 
     /**


Mime
View raw message