CVS update of BRANCH_sequoia-2_10 <src>/org/continuent/sequoia/controller/virtualdatabase (1 file)

    Date: Monday, November 20, 2006 @ 16:26:07
  Author: olivier
    Path: .../sequoia/src/org/continuent/sequoia/controller/virtualdatabase
     Tag: BRANCH_sequoia-2_10

Modified: VirtualDatabaseWorkerThread.java (1.183.2.5 -> 1.183.2.6)

SEQUOIA-777/UNICLUSTER-74:
- now considering an unexpected client socket close
  as an implicit close command.


----------------------------------+
 VirtualDatabaseWorkerThread.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)


Index: 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/VirtualDatabaseWorkerThread.java
diff -u 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/VirtualDatabaseWorkerThread.java:1.183.2.5
 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/VirtualDatabaseWorkerThread.java:1.183.2.6
--- 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/VirtualDatabaseWorkerThread.java:1.183.2.5
    Mon Nov 13 18:44:23 2006
+++ 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/VirtualDatabaseWorkerThread.java
      Mon Nov 20 16:26:07 2006
@@ -417,13 +417,16 @@
                  catch (NullPointerException e)
                  {
                          // SEQUOIA-777: this NPE happens when this thread is 
blocked
-                         // on in.read() and 'in' gets closed by the shutdown 
thread.
-                         // This is a known issue with jdk < 1.5, see 
SEQUOIA-777.
-                         // In this shutdown case, the flag isKilled is set
-                         // and we can exit the while loop.
+                         // on in.read() and 'in' gets closed either explicitly
+                         // by the shutdown thread or by an unexpected client 
socket death.
+                         // The NPE is a known issue with jdk < 1.5, see 
SEQUOIA-777.
+                         // In the shutdown case, the flag isKilled is set
+                         // and we can exit the while loop. Otherwize, the 
client socket
+                         // died unexpectedly and we consider this is a CLOSE.
                          if (isKilled)
                                  continue;
-                         throw e;
+                         logger.warn("Client unexpectedly dropped connection. 
Closing.");
+                         command = Commands.Close;
                  }
           }