TEIID-5430: Closing Teiid JDBC connection is delayed 5 seconds (makin…

…g the close wait much smaller)
teiid · Aug 2, 2018 · 828db5e · 828db5e
1 parent 5f34267
commit 828db5e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html b/build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
@@ -246,6 +246,9 @@ <h4 class="western">from ${project.version}</h4>
 <li/>
 	<p style="margin-bottom: 0in">
 <a href='https://issues.jboss.org/browse/TEIID-5422'>TEIID-5422</a> - Buffer cleaner running too often in some cases (changing the cleaning interval to prevent thrashing)
+<li/>
+	<p style="margin-bottom: 0in">
+<a href='https://issues.jboss.org/browse/TEIID-5430'>TEIID-5430</a> - Closing Teiid JDBC connection is delayed 5 seconds (making the close wait much smaller)
 </ul>
 
 <h4 class="western">from  8.12.14.6_4</h4>  

diff --git a/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java b/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java
@@ -326,9 +326,11 @@ private void logoffAll() {
 	private void logoff() {
 		disconnect();
 		try {
-			//make a best effort to send the logoff
+			//make a best effort to send the logoff, and wait a small amount for a response
+		    //this will ensure a "proper" session termination on the server side,
+		    //rather than implicit closure when the socket is closed
 			Future<?> writeFuture = this.serverInstance.getService(ILogon.class).logoff();
-			writeFuture.get(5000, TimeUnit.MILLISECONDS);
+			writeFuture.get(100, TimeUnit.MILLISECONDS);
 		} catch (Exception e) {
 			//ignore
 		}