From 86b921ec0a4ce7bd1fd1f39aa034f56a918abb9f Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Fri, 9 Jan 2009 21:52:09 +0000
Subject: [PATCH] Improved the error diagnosis, after seeing
 http://www.nabble.com/error-installing-hudson-as-a-windows-service-tt21378003.html

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@14315 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/src/main/java/hudson/Util.java                  | 11 +++++++++++
 core/src/main/java/hudson/util/jna/JnaException.java |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java
index 97342ca11f..5bf7c3bf73 100644
--- a/core/src/main/java/hudson/Util.java
+++ b/core/src/main/java/hudson/Util.java
@@ -323,6 +323,17 @@ public class Util {
         return null; // no message
     }
 
+    /**
+     * Gets a human readable mesasge for the given Win32 error code.
+     *
+     * @return
+     *      null if no such message is available.
+     */
+    public static String getWin32ErrorMessage(int n) {
+        ResourceBundle rb = ResourceBundle.getBundle("/hudson/win32errors");
+        return rb.getString("error"+n);
+    }
+
     /**
      * Guesses the current host name.
      */
diff --git a/core/src/main/java/hudson/util/jna/JnaException.java b/core/src/main/java/hudson/util/jna/JnaException.java
index 56d789d1d3..dcf2cf0815 100644
--- a/core/src/main/java/hudson/util/jna/JnaException.java
+++ b/core/src/main/java/hudson/util/jna/JnaException.java
@@ -1,5 +1,7 @@
 package hudson.util.jna;
 
+import hudson.Util;
+
 /**
  * Exception in the registry code.
  *
@@ -7,6 +9,6 @@ package hudson.util.jna;
  */
 public class JnaException extends RuntimeException {
     public JnaException(int errorCode) {
-        super("Win32 error: "+errorCode);
+        super("Win32 error: "+errorCode+" - "+Util.getWin32ErrorMessage(errorCode));
     }
 }
-- 
GitLab