[Amdatu-commits] SVN r2493 - branches/amdatu-cassandra-0.2.5/cassandra-launcher/src/main/java/org/amdatu/cassandra/launcher/service

[subversion]

Author: ivo...@gmail.com
Date: Fri Jun 15 10:39:31 2012
New Revision: 2493

Log:
[AMDATUCASSANDRA-210] Fixed process launcher issues on Linux

Modified:
   
branches/amdatu-cassandra-0.2.5/cassandra-launcher/src/main/java/org/amdatu/cassandra/launcher/service/CassandraLauncherImpl.java

Modified: 
branches/amdatu-cassandra-0.2.5/cassandra-launcher/src/main/java/org/amdatu/cassandra/launcher/service/CassandraLauncherImpl.java
==============================================================================
--- 
branches/amdatu-cassandra-0.2.5/cassandra-launcher/src/main/java/org/amdatu/cassandra/launcher/service/CassandraLauncherImpl.java
   (original)
+++ 
branches/amdatu-cassandra-0.2.5/cassandra-launcher/src/main/java/org/amdatu/cassandra/launcher/service/CassandraLauncherImpl.java
   Fri Jun 15 10:39:31 2012
@@ -46,11 +46,6 @@
 
     @SuppressWarnings("rawtypes")
     public synchronized boolean startCassandra() {
-        if (m_configPid != null) {
-            m_logService.log(LogService.LOG_WARNING, "Cannot launch Cassandra, 
it is already running.");
-            return false;
-        }
-
         // Step 1. Install or update Cassandra and retrieve the Cassandra home 
dir
         File cassandraHome = m_installer.installOrUpdate();
         if (cassandraHome == null) {
@@ -98,7 +93,6 @@
         if (m_configPid != null) {
             try {
                 m_processLauncher.stopProcess(m_configPid);
-                m_configPid = null;
             }
             catch (Exception e) {
                 m_logService.log(LogService.LOG_ERROR, "An error occured while 
stopping Cassandra", e);
@@ -108,7 +102,7 @@
 
     private String buildExecutable(String cassandraHome) {
         String javaHome = m_configurator.getJavaHome();
-        String java = "\"" + javaHome + "/bin/java\" ";
+        String java = javaHome + "/bin/java";
         return java.replace("\\", "/");
     }
     
@@ -125,7 +119,7 @@
 
         // Prepare java executable command
         StringBuffer exe = new StringBuffer();
-        exe.append(("-ea -javaagent:\"" + cassandraHome + 
"/lib/jamm-0.2.5.jar\"").replace("\\", "/")); // javaagent
+        exe.append(("-ea -javaagent:" + cassandraHome + 
"/lib/jamm-0.2.5.jar").replace("\\", "/")); // javaagent
 
         // Append java options
         exe.append(" " + javaOpts);
@@ -139,7 +133,7 @@
         }
 
         exe.append(" -cp " + buildClasspath(cassandraHome));
-        exe.append(" \"org.apache.cassandra.thrift.CassandraDaemon\"");
+        exe.append(" org.apache.cassandra.thrift.CassandraDaemon");
         return exe.toString();
     }
 
@@ -147,7 +141,7 @@
         String sep = File.separator;
 
         StringBuffer cp = new StringBuffer();
-        cp.append("\"" + cassandraHome + sep + "conf\"");
+        cp.append(cassandraHome + sep + "conf");
 
         String[] jars = new File(cassandraHome + "/lib").list(new 
FilenameFilter() {
             public boolean accept(File dir, String name) {
@@ -155,7 +149,7 @@
             }
         });
         for (String jar : jars) {
-            cp.append(File.pathSeparator + "\"" + cassandraHome + "/lib/" + 
jar + "\"");
+            cp.append(File.pathSeparator + cassandraHome + "/lib/" + jar);
         }
         return cp.toString().replace("\\", "/");
     }
_______________________________________________
Amdatu-commits mailing list
Amdatu-commits@amdatu.org
http://lists.amdatu.org/mailman/listinfo/amdatu-commits