svn commit: r1454340 - /commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

[mturk]

Author: mturk
Date: Fri Mar  8 12:19:02 2013
New Revision: 1454340

URL: http://svn.apache.org/r1454340
Log:
Make code more readable - no functional change

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

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=1454340&r1=1454339&r2=1454340&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 
Fri Mar  8 12:19:02 2013
@@ -979,15 +979,17 @@ static DWORD WINAPI serviceStop(LPVOID l
             apxLogWrite(APXLOG_MARK_ERROR "Failed starting java");
             rv = 3;
         }
-        else if (lstrcmpA(_jni_sclass, "java/lang/System") == 0) {
-            reportServiceStatus(SERVICE_STOP_PENDING, NO_ERROR, 5000);
-            apxLogWrite(APXLOG_MARK_DEBUG "Forcing java jni System.exit worker 
to finish...");
-            return 0;
-        }
         else {
-            apxLogWrite(APXLOG_MARK_DEBUG "Waiting for java jni stop worker to 
finish...");
-            apxJavaWait(hWorker, INFINITE, FALSE);
-            apxLogWrite(APXLOG_MARK_DEBUG "Java jni stop worker finished.");
+            if (lstrcmpA(_jni_sclass, "java/lang/System") == 0) {
+                reportServiceStatus(SERVICE_STOP_PENDING, NO_ERROR, 5000);
+                apxLogWrite(APXLOG_MARK_DEBUG "Forcing java jni System.exit 
worker to finish...");
+                return 0;
+            }
+            else {
+                apxLogWrite(APXLOG_MARK_DEBUG "Waiting for java jni stop 
worker to finish...");
+                apxJavaWait(hWorker, INFINITE, FALSE);
+                apxLogWrite(APXLOG_MARK_DEBUG "Java jni stop worker 
finished.");
+            }
         }
         wait_to_die = TRUE;
     }