From 32d964ff54cf1c2947ccb00f4cc6c1fcda3510e0 Mon Sep 17 00:00:00 2001 From: Eric Evans Date: Tue, 21 Jul 2009 15:21:59 +0000 Subject: [PATCH] better handling of file names with spaces on windows - Quote path names in startup bat file - Pass File object instead of URI when parsing storage-conf.xml Patch by Michael Greene; reviewed by eevans for CASSANDRA-307 git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796345 13f79535-47bb-0310-9956-ffa450edef68 --- bin/cassandra.bat | 4 ++-- src/java/org/apache/cassandra/utils/XMLUtils.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/cassandra.bat b/bin/cassandra.bat index 0f6db13a8f..135fbcdbff 100644 --- a/bin/cassandra.bat +++ b/bin/cassandra.bat @@ -45,7 +45,7 @@ set JAVA_OPTS=^ REM ***** CLASSPATH library setting ***** REM Shorten lib path for old platforms -subst P: %CASSANDRA_HOME%\lib +subst P: "%CASSANDRA_HOME%\lib" P: set CLASSPATH=P:\ @@ -58,7 +58,7 @@ goto :eof :okClasspath set CASSANDRA_CLASSPATH=%CASSANDRA_HOME%;%CASSANDRA_CONF%;%CLASSPATH%;%CASSANDRA_HOME%\build\classes -set CASSANDRA_PARAMS=-Dcassandra -Dstorage-config=%CASSANDRA_CONF% +set CASSANDRA_PARAMS=-Dcassandra -Dstorage-config="%CASSANDRA_CONF%" goto runDaemon :runDaemon diff --git a/src/java/org/apache/cassandra/utils/XMLUtils.java b/src/java/org/apache/cassandra/utils/XMLUtils.java index 4907337f0b..788866b58e 100644 --- a/src/java/org/apache/cassandra/utils/XMLUtils.java +++ b/src/java/org/apache/cassandra/utils/XMLUtils.java @@ -43,7 +43,8 @@ public class XMLUtils { DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); DocumentBuilder db = dbf.newDocumentBuilder(); - document_ = db.parse(xmlSrc); + File xmlFile = new File(xmlSrc); + document_ = db.parse(xmlFile); XPathFactory xpathFactory = XPathFactory.newInstance(); xpath_ = xpathFactory.newXPath();