Avoid IDE warning

The IDE can't figure out that service is never null if the loop exits without an exception.
apache · Nov 27, 2024 · 5fe0c23 · 5fe0c23
1 parent b742e65
commit 5fe0c23
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/test/org/apache/catalina/startup/TestTomcatStandalone.java b/test/org/apache/catalina/startup/TestTomcatStandalone.java
@@ -252,19 +252,15 @@ public void run() {
 
         Service service = null;
         int i = 0;
-        while (true) {
-            Assert.assertTrue(i++ < 500);
-            if (service == null) {
-                Server server = catalina.getServer();
-                if (server != null && catalina.getServer().findServices().length > 0) {
-                    service = catalina.getServer().findServices()[0];
-                }
-            }
-            if (service != null && service.getState() == LifecycleState.STARTED) {
-                break;
+        while (i < 500 && (service == null || service.getState() != LifecycleState.STARTED)) {
+            Server server = catalina.getServer();
+            if (server != null && catalina.getServer().findServices().length > 0) {
+                service = catalina.getServer().findServices()[0];
             }
             Thread.sleep(10);
+            i++;
         }
+        Assert.assertNotNull(service);
 
         Connector connector = service.findConnectors()[0];
         res = TomcatBaseTest.getUrl("http://localhost:" + connector.getLocalPort() + "/");