From 2d36caf004cdf8fcd3005d6146f227579614f406 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 2 Aug 2011 09:22:24 +0000
Subject: [PATCH] Prevent direct invocation of the Windows uninstaller without
 a service name from executing since the uninstall will not be complete.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1153075 13f79535-47bb-0310-9956-ffa450edef68
---
 res/tomcat.nsi             | 8 ++++++++
 webapps/docs/changelog.xml | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index a9a80db3b..550d0abb8 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -1085,6 +1085,14 @@ FunctionEnd
 
 Section Uninstall
 
+  ${If} $TomcatServiceName == ""
+    MessageBox MB_ICONSTOP|MB_OK \
+        "No service name specified to uninstall. This will be provided automatically if you uninstall via \
+         Add/Remove Programs or the shortcut on the Start menu. Alternatively, call the installer from \
+         the command line with -serviceName=$\"<name of service>$\"."
+    Quit
+  ${EndIf}
+  
   Delete "$INSTDIR\Uninstall.exe"
 
   ; Stop Tomcat service monitor if running
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 143cd95a5..d6f60b00a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -244,6 +244,11 @@
         Correctly handle uninstall with the Windows installer of the service is
         installed with a name that contains a &apos;-&apos; character. (markt)
       </fix>
+      <fix>
+        <bug>51598</bug>: Prevent direct invocation of the Windows uninstaller
+        without a service name from executing since the uninstall will not be
+        complete. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>
-- 
2.11.0