Allow waitForSerialEvent() to throw any kind of exception

Fazecast · Sep 3, 2019 · e807406 · e807406
1 parent 04d1bb2
commit e807406
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/com/fazecast/jSerialComm/SerialPort.java b/src/main/java/com/fazecast/jSerialComm/SerialPort.java
@@ -1245,7 +1245,7 @@ public void run()
 					while (isListening && isOpened)
 					{
 						try { waitForSerialEvent(); }
-						catch (NullPointerException e)
+						catch (Exception e)
 						{
 							isListening = false;
 							if (userDataListener instanceof SerialPortDataListenerWithExceptions)
@@ -1267,12 +1267,12 @@ public final void stopListening()
 			int oldEventFlags = eventFlags;
 			eventFlags = 0;
 			configEventFlags(portHandle);
+			eventFlags = oldEventFlags;
 			try { serialEventThread.join(); } catch (InterruptedException e) {}
 			serialEventThread = null;
-			eventFlags = oldEventFlags;
 		}
 
-		public final void waitForSerialEvent() throws NullPointerException
+		public final void waitForSerialEvent() throws Exception
 		{
 			switch (waitForEvent(portHandle))
 			{