ZOOKEEPER-2536: When provide path for 'dataDir' with trailing space, …

…it is taking correct path (by trucating space) for snapshot but creating temporary file with some junk folder name for zookeeper_server.pid (Rakesh Kumar Singh via phunt)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1759739 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -365,6 +365,12 @@ BUGFIXES:
   ZOOKEEPER-2558: Potential memory leak in recordio.c
   (Michael Han via phunt)
 
+  ZOOKEEPER-2536: When provide path for 'dataDir' with trailing space,
+  it is taking correct path (by trucating space) for snapshot but
+  creating temporary file with some junk folder name for
+  zookeeper_server.pid (Rakesh Kumar Singh via phunt)
+
+
 IMPROVEMENTS:
   ZOOKEEPER-2024 Major throughput improvement with mixed workloads (Kfir Lev-Ari via shralex)
 

bin/zkServer.sh

@@ -111,6 +111,7 @@ case "$OSTYPE" in
   ;;
 esac
 ZOO_DATADIR="$($GREP "^[[:space:]]*dataDir" "$ZOOCFG" | sed -e 's/.*=//')"
+ZOO_DATADIR="$(echo -e "${ZOO_DATADIR}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
 ZOO_DATALOGDIR="$($GREP "^[[:space:]]*dataLogDir" "$ZOOCFG" | sed -e 's/.*=//')"
 
 # iff autocreate is turned off and the datadirs don't exist fail