Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 73993 invoked from network); 18 Jan 2011 09:17:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Jan 2011 09:17:54 -0000 Received: (qmail 22303 invoked by uid 500); 18 Jan 2011 09:17:47 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 22256 invoked by uid 500); 18 Jan 2011 09:17:43 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 22249 invoked by uid 99); 18 Jan 2011 09:17:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jan 2011 09:17:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jan 2011 09:17:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 72ECA23889EA; Tue, 18 Jan 2011 09:17:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1060258 - in /commons/proper/daemon/trunk: RELEASE-NOTES.txt src/native/windows/apps/prunsrv/prunsrv.c Date: Tue, 18 Jan 2011 09:17:13 -0000 To: commits@commons.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110118091713.72ECA23889EA@eris.apache.org> Author: mturk Date: Tue Jan 18 09:17:07 2011 New Revision: 1060258 URL: http://svn.apache.org/viewvc?rev=1060258&view=rev Log: DAEMON-193: Apply modified patch provided by Mickaël Remars Modified: commons/proper/daemon/trunk/RELEASE-NOTES.txt commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.c Modified: commons/proper/daemon/trunk/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/RELEASE-NOTES.txt?rev=1060258&r1=1060257&r2=1060258&view=diff ============================================================================== --- commons/proper/daemon/trunk/RELEASE-NOTES.txt (original) +++ commons/proper/daemon/trunk/RELEASE-NOTES.txt Tue Jan 18 09:17:07 2011 @@ -70,7 +70,7 @@ NEW FEATURES: BUG FIXES: -1.0.6: DAEMON-186, DAEMON-194 +1.0.6: DAEMON-186, DAEMON193, DAEMON-194 1.0.5: DAEMON-158, DAEMON-187, DAEMON-188, DAEMON-190 Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.c URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.c?rev=1060258&r1=1060257&r2=1060258&view=diff ============================================================================== --- commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.c (original) +++ commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.c Tue Jan 18 09:17:07 2011 @@ -65,6 +65,7 @@ static LPCWSTR PRSRV_JDK = L"jdk static LPCWSTR PRSRV_JRE = L"jre"; static LPCWSTR PRSRV_MANUAL = L"manual"; static LPCWSTR PRSRV_JBIN = L"\\bin\\java.exe"; +static LPCWSTR PRSRV_PBIN = L"\\bin"; static LPCWSTR PRSRV_SIGNAL = L"SIGNAL"; static LPCWSTR STYPE_INTERACTIVE = L"interactive"; @@ -1289,7 +1290,13 @@ void WINAPI serviceMain(DWORD argc, LPTS jx = apxPoolAlloc(gPool, (lstrlenW(szJH) + 16) * sizeof(WCHAR)); lstrcpyW(jx, szJH); lstrcatW(jx, PRSRV_JBIN); - SO_STARTPATH = szJH; + if (!SO_STARTPATH) { + /* Use JAVA_HOME/bin as start path */ + LPWSTR szJP = apxPoolAlloc(gPool, (lstrlenW(szJH) + 8) * sizeof(WCHAR)); + lstrcpyW(szJP, szJH); + lstrcatW(szJP, PRSRV_PBIN); + SO_STARTPATH = szJP; + } } else { apxLogWrite(APXLOG_MARK_ERROR "Unable to find Java Runtime Environment."); @@ -1324,7 +1331,13 @@ void WINAPI serviceMain(DWORD argc, LPTS jx = apxPoolAlloc(gPool, (lstrlenW(szJH) + 16) * sizeof(WCHAR)); lstrcpyW(jx, szJH); lstrcatW(jx, PRSRV_JBIN); - SO_STOPPATH = szJH; + if (!SO_STOPPATH) { + LPWSTR szJP = apxPoolAlloc(gPool, (lstrlenW(szJH) + 8) * sizeof(WCHAR)); + lstrcpyW(szJP, szJH); + lstrcatW(szJP, PRSRV_PBIN); + /* Use JAVA_HOME/bin as stop path */ + SO_STOPPATH = szJP; + } } else { apxLogWrite(APXLOG_MARK_ERROR "Unable to find Java Runtime Environment.");