svn commit: r1412003 - /commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c

[mturk]

Author: mturk
Date: Wed Nov 21 07:51:53 2012
New Revision: 1412003

URL: http://svn.apache.org/viewvc?rev=1412003&view=rev
Log:
DAEMON-247: Report explicitly specified invalid jvm.dll as error

Modified:
    commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c

Modified: commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c?rev=1412003&r1=1412002&r2=1412003&view=diff
==============================================================================
--- commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c 
(original)
+++ commons/proper/daemon/branches/1.0.x/src/native/windows/src/javajni.c Wed 
Nov 21 07:51:53 2012
@@ -185,10 +185,22 @@ static BOOL __apxLoadJvmDll(LPCWSTR szJv
     if (!IS_INVALID_HANDLE(_st_sys_jvmDllHandle))
         return TRUE;    /* jvm.dll is already loaded */
 
-    if (!dllJvmPath || *dllJvmPath == L'\0')
+    if (dllJvmPath && *dllJvmPath) {
+        /* Explicit JVM path.
+         * Check if provided argument is valid
+         */
+        if (GetFileAttributesW(dllJvmPath) == INVALID_FILE_ATTRIBUTES) {
+            /* DAEMON-247: Invalid RuntimeLib explicitly specified is error.
+             */
+            apxLogWrite(APXLOG_MARK_DEBUG "Invalid RuntimeLib specified '%S'", 
dllJvmPath);
+            return FALSE;
+        }
+    }
+    else {
         dllJvmPath = apxGetJavaSoftRuntimeLib(NULL);
-    if (!dllJvmPath)
-        return FALSE;
+        if (!dllJvmPath)
+            return FALSE;
+    }
     if (GetFileAttributesW(dllJvmPath) == INVALID_FILE_ATTRIBUTES) {
         /* DAEMON-184: RuntimeLib registry key is invalid.
          * Check from Jre JavaHome directly
@@ -657,7 +669,7 @@ apxJavaInitialize(APXHANDLE hJava, LPCST
         /* unconditionally add hook for System.exit() in order to store exit 
code */
         lpJvmOptions[nOptions - sOptions].optionString = "exit";
         lpJvmOptions[nOptions - sOptions].extraInfo    = __apxJniExit;
-        --sOptions; 
+        --sOptions;
 
         if (dwMs) {
             wsprintfA(iB[0], "-Xms%dm", dwMs);