Author: ggregory Date: Wed Sep 19 18:15:55 2018 New Revision: 1841361 URL: http://svn.apache.org/viewvc?rev=1841361&view=rev Log: [DAEMON-393] Revered code comments for JRE and JDK locations in the registry.
Modified: commons/proper/daemon/trunk/src/changes/changes.xml commons/proper/daemon/trunk/src/native/windows/src/registry.c Modified: commons/proper/daemon/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/changes/changes.xml?rev=1841361&r1=1841360&r2=1841361&view=diff ============================================================================== --- commons/proper/daemon/trunk/src/changes/changes.xml (original) +++ commons/proper/daemon/trunk/src/changes/changes.xml Wed Sep 19 18:15:55 2018 @@ -52,6 +52,9 @@ <action issue="DAEMON-384" type="fix" dev="ggregory" due-to="blassmegod"> prunsrv stopping with error due to hardcoded timeout. </action> + <action issue="DAEMON-393" type="fix" dev="ggregory" due-to="Daniel Hofmann"> + Revered code comments for JRE and JDK locations in the registry. + </action> </release> <release version="1.1.0" date="2017-11-15" description="Feature and bug fix release"> <action issue="DAEMON-368" type="add" dev="ggregory"> Modified: commons/proper/daemon/trunk/src/native/windows/src/registry.c URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/registry.c?rev=1841361&r1=1841360&r2=1841361&view=diff ============================================================================== --- commons/proper/daemon/trunk/src/native/windows/src/registry.c (original) +++ commons/proper/daemon/trunk/src/native/windows/src/registry.c Wed Sep 19 18:15:55 2018 @@ -29,14 +29,14 @@ static LPCWSTR REGAPACHE_ROOT = L"Apac * The code below assumes the JRE and JDK arrays are the same length */ static LPCWSTR JRE_REGKEYS[] = { - L"SOFTWARE\\JavaSoft\\JRE\\", /* Oracle Java 8 and earlier */ - L"SOFTWARE\\JavaSoft\\Java Runtime Environment\\", /* Oracle Java 9 (and hopefully later) */ + L"SOFTWARE\\JavaSoft\\JRE\\", /* Oracle Java 9 (and hopefully later) */ + L"SOFTWARE\\JavaSoft\\Java Runtime Environment\\", /* Oracle Java 8 (and older) */ L"SOFTWARE\\IBM\\Java2 Runtime Environment\\", /* IBM */ NULL }; static LPCWSTR JDK_REGKEYS[] = { - L"SOFTWARE\\JavaSoft\\JDK\\", /* Oracle Java 8 and ealier */ - L"SOFTWARE\\JavaSoft\\Java Development Kit\\", /* Oracle Java 9 (and hopefully later) */ + L"SOFTWARE\\JavaSoft\\JDK\\", /* Oracle Java 9 and (and hopefully later) */ + L"SOFTWARE\\JavaSoft\\Java Development Kit\\", /* Oracle Java 8 (and older) */ L"SOFTWARE\\IBM\\Java2 Development Kit\\", /* IBM */ NULL };