Correctly handle uninstall with the Windows installer of the service is installed...

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

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 02bd14d..4b0e3c6 100644 (file)
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -1049,7 +1049,7 @@ Function createShortcuts
   ${EndIf}
 
   CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName\Uninstall Tomcat @VERSION_MAJOR_MINOR@.lnk" \
-                 "$INSTDIR\Uninstall.exe" "-ServiceName=$TomcatServiceName"
+                 "$INSTDIR\Uninstall.exe" '-ServiceName="$TomcatServiceName"'
 
   CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName\Tomcat @VERSION_MAJOR_MINOR@ Program Directory.lnk" \
                  "$INSTDIR"

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 582f2e6..143cd95 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -240,6 +240,10 @@
         Simplify mapping for <code>jsp</code> servlet in the default
         <code>web.xml</code>. (kkolinko)
       </update>
+      <fix>
+        Correctly handle uninstall with the Windows installer of the service is
+        installed with a name that contains a &apos;-&apos; character. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>