(commons-daemon) branch master updated: Fix typos in DAEMON-475 fix

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git


The following commit(s) were added to refs/heads/master by this push:
     new 64209d4  Fix typos in DAEMON-475 fix
64209d4 is described below

commit 64209d498d807953a565542f13e6a39e093d1188
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Nov 17 14:16:57 2025 +0000

    Fix typos in DAEMON-475 fix
---
 src/native/windows/apps/prunsrv/prunsrv.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/native/windows/apps/prunsrv/prunsrv.c 
b/src/native/windows/apps/prunsrv/prunsrv.c
index 53fe043..76bb997 100644
--- a/src/native/windows/apps/prunsrv/prunsrv.c
+++ b/src/native/windows/apps/prunsrv/prunsrv.c
@@ -1923,11 +1923,11 @@ void WINAPI serviceMain(DWORD argc, LPTSTR *argv)
                 DWORD rv = apxHandleWait(gWorker, 2000, FALSE);
                 if (rv == WAIT_OBJECT_0 && _exe_shutdown) {
                     /* Normal exit. NO-OP */
-                } else if (rv != WAIT_OBJECT_0 && !_exe_shutdown)) {
+                } else if (rv != WAIT_OBJECT_0 && !_exe_shutdown) {
                     /* Normal running. */
                     apxLogWrite(APXLOG_MARK_DEBUG "waiting until Worker is 
done...");
                 } else if (rv == WAIT_OBJECT_0 && !_exe_shutdown) {
-                    if (_jni_started) {
+                    if (_jni_startup) {
                         /* JNI mode not being used correctly */
                         if (!bLoopWarningIssued) {
                             apxLogWrite(APXLOG_MARK_WARN "Start method 
returned before stop method was called. This should not happen. Using loop with 
a fixed sleep of 2 seconds waiting for stop method to be called.");
@@ -1939,7 +1939,7 @@ void WINAPI serviceMain(DWORD argc, LPTSTR *argv)
                         apxLogWrite(APXLOG_MARK_ERROR "Service '%S' has 
terminated abnormally.", _service_name);
                         break;
                     }
-                } else if (rv != WAIT_OBJECT_0 && _exe_shutdown)) {
+                } else if (rv != WAIT_OBJECT_0 && _exe_shutdown) {
                     /* Stop has been called but service worker has not yet 
stopped. */
                     /* do ... while loop will exit and stop timeout will be 
processed. */
                 }