Fix for JDBC-232 : event Thread consumes 100% CPU time after Firebird…

… shutdown/crash

+ Improved robustness of closing connection and XdrInputStream / XdrOutputStream

src/main/org/firebirdsql/gds/impl/wire/AbstractJavaGDSImpl.java

@@ -3067,9 +3067,6 @@ class EventCoordinatorImp implements EventCoordinator, Runnable {
         private int handle;
         private String ipAddress;
         private int port;
-        private Socket socket;
-        private XdrOutputStream out;
-        private WireXdrInputStream in;
         private int eventsId = 0;
         isc_db_handle_impl db;
         private Map globMap = new HashMap();
@@ -3143,29 +3140,35 @@ public void run(){
                             break;
                     }
                 }                 
-                doClose();
-            } catch (IOException ioe){
-                throw new RuntimeException(
-                        "IOException in event loop: " + ioe.getMessage());
-            } catch (GDSException gdse){
-                throw new RuntimeException(
-                        "GDSException in event loop: " + gdse.getMessage());
+            } catch (IOException ioe) {
+                if (log != null) {
+                    log.fatal("IOException in event loop: " + ioe.getMessage(), ioe);
+                }
+            } catch (GDSException gdse) {
+                if (log != null) {
+                    log.fatal("GDSException in event loop: " + gdse.getMessage(), gdse);
+                }
+            } finally {
+                try {
+                    doClose();
+                } catch (IOException e) {
+                    if (log != null && log.isDebugEnabled()) {
+                        log.debug("IOException closing event connection", e);
+                    }
+                }
             }
         }
-
 
         /**
          * Connect to receive event callbacks
          */
         private void connect() throws GDSException {
             try {
                 db = new isc_db_handle_impl();
-                socket = new Socket(ipAddress, port);
-                socket.setTcpNoDelay(true);
-                out = new XdrOutputStream(socket.getOutputStream());
-                in = new WireXdrInputStream(socket.getInputStream());
-                db.in = in;
-                db.out = out;
+                db.socket = new Socket(ipAddress, port);
+                db.socket.setTcpNoDelay(true);
+                db.out = new XdrOutputStream(db.socket.getOutputStream());
+                db.in = new WireXdrInputStream(db.socket.getInputStream());
             } catch (UnknownHostException uhe){
                 throw new GDSException(
                         ISCConstants.isc_arg_gds, 
@@ -3184,22 +3187,9 @@ public void close() throws IOException {
         }
 
         private void doClose() throws IOException {
-            if (in != null){
-                in.close();
-                in = null;
-            }
-            if (out != null){
-                out.close();
-                out = null;
-            }
-            if (socket != null){
-                socket.close();
-                socket = null;
-            }
-
+            db.invalidate();
         }
 
-
         public void queueEvents(isc_db_handle_impl mainDb, 
                 EventHandleImp eventHandle, 
                 EventHandler eventHandler) throws GDSException {
@@ -3253,7 +3243,6 @@ public EventHandleImp getEventHandle(){
         }
     }
 
-
     public void fbCancelOperation(IscDbHandle dbHandle, int kind)
             throws GDSException {
 

src/main/org/firebirdsql/gds/impl/wire/XdrInputStream.java

@@ -253,6 +253,8 @@ public int read() throws IOException {
             int readn = in.read(buf, 0, defaultBufferSize);
             if (readn > 0)
                 count = readn;
+            else 
+                throw new EOFException();
         }
         return buf[pos++] & 0xff;
     }
@@ -266,8 +268,11 @@ public int read() throws IOException {
     public void close() throws IOException {
         if (in == null)
             return;
-        in.close();
-        in = null;
-        buf = null;
+        try {
+            in.close();
+        } finally {
+            in = null;
+            buf = null;
+        }
     }
 }

src/main/org/firebirdsql/gds/impl/wire/XdrOutputStream.java

@@ -393,7 +393,12 @@ public void flush() throws IOException {
      *         underlying stream
      */
     public void close() throws IOException {
-        out.close();
+        try {
+            out.close();
+        } finally {
+            buf = null;
+            out = null;
+        }
     }
 
 

src/main/org/firebirdsql/gds/impl/wire/isc_db_handle_impl.java

@@ -54,20 +54,42 @@ public isc_db_handle_impl() {
     }
 
     protected void invalidate() throws IOException {
-
         if (!isValid())
             return;
+
+        IOException ioeToThrow = null;
 
         // TODO: Shouldn't this synchronize on *this*?
-        in.close();
-        out.close();
-        socket.close();
-
-        in = null;
-        out = null;
-        socket = null;
-
-        invalidateHandle();
+        try {
+            try {
+                in.close();
+            } catch (IOException e) {
+                ioeToThrow = e;
+            }
+            try {
+                out.close();
+            } catch (IOException e) {
+                if (ioeToThrow == null) {
+                    ioeToThrow = e;
+                }
+            }
+            try {
+                socket.close();
+            } catch (IOException e) {
+                if (ioeToThrow == null) {
+                    ioeToThrow = e;
+                }
+            }
+        } finally {
+            in = null;
+            out = null;
+            socket = null;
+
+            invalidateHandle();
+            if (ioeToThrow != null) {
+                throw ioeToThrow;
+            }
+        }
     }
 
     void addTransaction(isc_tr_handle_impl tr) {