More sonar fixes

robstryker · robstryker · commit 7cfc604cc78e · 2023-02-02T15:26:08.000-05:00
Signed-off-by: Rob Stryker &lt;rob@oxbeef.net&gt;
diff --git a/framework/bundles/org.jboss.tools.rsp.launching/src/main/java/org/jboss/tools/rsp/eclipse/debug/core/model/RuntimeProcess.java b/framework/bundles/org.jboss.tools.rsp.launching/src/main/java/org/jboss/tools/rsp/eclipse/debug/core/model/RuntimeProcess.java
@@ -431,9 +431,7 @@ public void run() {
 				try {
 					fOSProcess.waitFor();
 				} catch (InterruptedException ie) {
-					// clear interrupted state
-					// This is intentional
-					Thread.interrupted();
+					Thread.currentThread().interrupt();
 				} finally {
 					fOSProcess = null;
 					fRuntimeProcess.terminated();
diff --git a/framework/bundles/org.jboss.tools.rsp.launching/src/main/java/org/jboss/tools/rsp/eclipse/debug/internal/core/InputStreamMonitor.java b/framework/bundles/org.jboss.tools.rsp.launching/src/main/java/org/jboss/tools/rsp/eclipse/debug/internal/core/InputStreamMonitor.java
@@ -158,7 +158,8 @@ protected void writeNext() {
 				fLock.wait();
 			}
 		} catch (InterruptedException e) {
-			// Intentionally not rethrown or set to interrupted
+			Thread.currentThread().interrupt();
+			close();
 		}
 	}
 
diff --git a/framework/bundles/org.jboss.tools.rsp.launching/src/main/java/org/jboss/tools/rsp/eclipse/debug/internal/core/OutputStreamMonitor.java b/framework/bundles/org.jboss.tools.rsp.launching/src/main/java/org/jboss/tools/rsp/eclipse/debug/internal/core/OutputStreamMonitor.java
@@ -108,8 +108,7 @@ protected void close() {
 			try {
 				thread.join();
 			} catch (InterruptedException ie) {
-				// Intentionally not rethrown or interrupt flag set. 
-				// Copied from org.eclipse
+				Thread.currentThread().interrupt();
 			}
 			fListeners = new ListenerList<>();
 		}
@@ -185,8 +184,8 @@ private void read() {
                 try {
                     Thread.sleep(1); // just give up CPU to maintain UI responsiveness.
                 } catch (InterruptedException e) {
-    				// Intentionally not rethrown or interrupt flag set. 
-    				// Copied from org.eclipse
+                	Thread.currentThread().interrupt();
+                	kill();
                 }
             }
 		}
diff --git a/framework/bundles/org.jboss.tools.rsp.server.spi/src/main/java/org/jboss/tools/rsp/server/spi/model/polling/PollThread.java b/framework/bundles/org.jboss.tools.rsp.server.spi/src/main/java/org/jboss/tools/rsp/server/spi/model/polling/PollThread.java
@@ -55,14 +55,19 @@ public void run() {
 			return;
 		}
 
-		int maxWait = getTimeout();
-
-		long startTime = System.currentTimeMillis();
-		boolean done = false;
-		boolean serverStartedOrStopped = false;
 		try {
 			poller.beginPolling(getServer(), expectedState);
-	
+		} catch(Exception e) {
+			LOG.error("Error occurred while polling, aborting.", e);
+			cancel(e.getMessage(), CANCELATION_CAUSE.FAILED);
+		}
+		
+		try {
+			int maxWait = getTimeout();
+			long startTime = System.currentTimeMillis();
+			boolean done = false;
+			boolean serverStartedOrStopped = false;
+			
 			// begin the loop; ask the poller every so often
 			while (!serverStartedOrStopped
 					&& !isAborted()
@@ -99,9 +104,9 @@ public void run() {
 				// we timed out. get response from preferences
 				handleTimeoutTermination();
 			}
-		} catch(Exception e) {
-			LOG.error("Error occurred while polling, aborting.", e);
-			cancel(e.getMessage(), CANCELATION_CAUSE.FAILED);
+		} catch( RuntimeException re) {
+			LOG.error("Error occurred while polling, aborting.", re);
+			cancel(re.getMessage(), CANCELATION_CAUSE.FAILED);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,8 @@ protected void writeNext() {`
`158`	`158`	`fLock.wait();`
`159`	`159`	`}`
`160`	`160`	`} catch (InterruptedException e) {`
`161`		`- // Intentionally not rethrown or set to interrupted`
	`161`	`+ Thread.currentThread().interrupt();`
	`162`	`+ close();`
`162`	`163`	`}`
`163`	`164`	`}`
`164`	`165`
Original file line number	Diff line number	Diff line change
`@@ -108,8 +108,7 @@ protected void close() {`
`108`	`108`	`try {`
`109`	`109`	`thread.join();`
`110`	`110`	`} catch (InterruptedException ie) {`
`111`		`- // Intentionally not rethrown or interrupt flag set.`
`112`		`- // Copied from org.eclipse`
	`111`	`+ Thread.currentThread().interrupt();`
`113`	`112`	`}`
`114`	`113`	`fListeners = new ListenerList<>();`
`115`	`114`	`}`
`@@ -185,8 +184,8 @@ private void read() {`
`185`	`184`	`try {`
`186`	`185`	`Thread.sleep(1); // just give up CPU to maintain UI responsiveness.`
`187`	`186`	`} catch (InterruptedException e) {`
`188`		`- // Intentionally not rethrown or interrupt flag set.`
`189`		`- // Copied from org.eclipse`
	`187`	`+ Thread.currentThread().interrupt();`
	`188`	`+ kill();`
`190`	`189`	`}`
`191`	`190`	`}`
`192`	`191`	`}`