Author: mturk
Date: Wed Mar 6 10:39:46 2013
New Revision: 1453275
URL: http://svn.apache.org/r1453275
Log:
Fix DAEMON-278 by calling setInprocEnvironment for non-JNI startup as well
Modified:
commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c
Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt?rev=1453275&r1=1453274&r2=1453275&view=diff
==============================================================================
--- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Wed Mar 6 10:39:46
2013
@@ -84,7 +84,7 @@ NEW FEATURES:
BUG FIXES:
-1.0.14: DAEMON-281, DAEMON-283
+1.0.14: DAEMON-278, DAEMON-281, DAEMON-283
1.0.13: DAEMON-275, DAEMON-276
Modified:
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c?rev=1453275&r1=1453274&r2=1453275&view=diff
==============================================================================
---
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c
(original)
+++
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c
Wed Mar 6 10:39:46 2013
@@ -1195,6 +1195,8 @@ static DWORD serviceStart()
/* Add LibraryPath to the PATH */
apxAddToPathW(gPool, SO_LIBPATH);
}
+ /* Set the environment using putenv, so JVM can use it */
+ setInprocEnvironment();
/* Redirect process */
gWorker = apxCreateProcessW(gPool,
0,
