From e8074068cf36aa5bcd0d0e6cdc2ef9669ec543ae Mon Sep 17 00:00:00 2001
From: hedgecrw85 <will.hedgecock@fazecast.com>
Date: Tue, 3 Sep 2019 13:49:53 -0500
Subject: [PATCH] Allow waitForSerialEvent() to throw any kind of exception

---
 src/main/java/com/fazecast/jSerialComm/SerialPort.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/fazecast/jSerialComm/SerialPort.java b/src/main/java/com/fazecast/jSerialComm/SerialPort.java
index 2dfedca..b319485 100644
--- a/src/main/java/com/fazecast/jSerialComm/SerialPort.java
+++ b/src/main/java/com/fazecast/jSerialComm/SerialPort.java
@@ -1245,7 +1245,7 @@ public final class SerialPort
 					while (isListening && isOpened)
 					{
 						try { waitForSerialEvent(); }
-						catch (NullPointerException e)
+						catch (Exception e)
 						{
 							isListening = false;
 							if (userDataListener instanceof SerialPortDataListenerWithExceptions)
@@ -1267,12 +1267,12 @@ public final class SerialPort
 			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))
 			{