db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From be...@apache.org
Subject svn commit: r545454 - in /db/derby/code/trunk/java/drda/org/apache/derby/impl/drda: ClientThread.java DRDAConnThread.java
Date Fri, 08 Jun 2007 08:22:47 GMT
Author: bernt
Date: Fri Jun  8 01:22:47 2007
New Revision: 545454

URL: http://svn.apache.org/viewvc?view=rev&rev=545454
Log:
DERBY-2748 TimeSlice and Socket-Timeout bounds checking wrong

Modified:
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java?view=diff&rev=545454&r1=545453&r2=545454
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java Fri Jun  8
01:22:47 2007
@@ -73,7 +73,7 @@
                         
                         // Set time out: Stops DDMReader.fill() from
                         // waiting indefinitely when timeSlice is set.
-                        if (timeSlice != 0)
+                        if (timeSlice > 0)
                             clientSocket.setSoTimeout(timeSlice);
                         
                         //create a new Session for this socket

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java?view=diff&rev=545454&r1=545453&r2=545454
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java Fri Jun 
8 01:22:47 2007
@@ -280,7 +280,7 @@
                                 // only when timeSlice is set.
                             }
 							currentTimeSlice = getTimeSlice();
-						} while ((currentTimeSlice == 0)  || 
+						} while ((currentTimeSlice <= 0)  || 
 							(System.currentTimeMillis() - timeStart < currentTimeSlice));
 
 						break;



Mime
View raw message