From bbcd44e0112a4d762f4b53b5c2d0e2f129de10df Mon Sep 17 00:00:00 2001
From: Benjamin Bentmann <bentmann@apache.org>
Date: Mon, 29 Mar 2010 11:02:03 +0000
Subject: [PATCH] [MNG-3529] mvn -Da=" " throws an exception

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@928714 13f79535-47bb-0310-9956-ffa450edef68
---
 apache-maven/src/bin/mvn                             | 12 ++++++------
 apache-maven/src/bin/mvnDebug                        | 12 ++++++------
 .../src/main/java/org/apache/maven/cli/MavenCli.java |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 2a1d3ab0c2..fc61044e77 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -154,11 +154,11 @@ if $cygwin; then
     HOME=`cygpath --path --windows "$HOME"`
 fi
 
-exec "$JAVACMD" \
+maven_exec_cmd="\"$JAVACMD\" \
   $MAVEN_OPTS \
-  -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
-  "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
-  "-Dmaven.home=${M2_HOME}"  \
-  ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS
-
+  -classpath \"${M2_HOME}\"/boot/plexus-classworlds-*.jar \
+  \"-Dclassworlds.conf=${M2_HOME}/bin/m2.conf\" \
+  \"-Dmaven.home=${M2_HOME}\"  \
+  ${CLASSWORLDS_LAUNCHER}"
 
+eval $maven_exec_cmd "$QUOTED_ARGS"
diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug
index ef10fef31d..f72898e512 100755
--- a/apache-maven/src/bin/mvnDebug
+++ b/apache-maven/src/bin/mvnDebug
@@ -158,12 +158,12 @@ if $cygwin; then
     HOME=`cygpath --path --windows "$HOME"`
 fi
 
-exec "$JAVACMD" \
+maven_exec_cmd="\"$JAVACMD\" \
   $MAVEN_OPTS \
   $MAVEN_DEBUG_OPTS \
-  -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
-  "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
-  "-Dmaven.home=${M2_HOME}"  \
-  ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS
-
+  -classpath \"${M2_HOME}\"/boot/plexus-classworlds-*.jar \
+  \"-Dclassworlds.conf=${M2_HOME}/bin/m2.conf\" \
+  \"-Dmaven.home=${M2_HOME}\"  \
+  ${CLASSWORLDS_LAUNCHER}"
 
+eval $maven_exec_cmd "$QUOTED_ARGS"
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index fd89fd9df7..c8577e1d7f 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -935,7 +935,7 @@ private static void setCliProperty( String property, Properties properties )
         {
             name = property.substring( 0, i ).trim();
 
-            value = property.substring( i + 1 ).trim();
+            value = property.substring( i + 1 );
         }
 
         properties.setProperty( name, value );