postgresql-jdbc.git / summary / log / commit / refs

commit    ca1f60ffb414891101b72a226ed4f36f97bf82e2
Author:   Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date:     Wed Mar 04 20:17:57 2020 +0000

    Revert "fix: remove receiving EOF from backend after cancel since according to protocol the server closes the connection once cancel is sent (connection reset exception is always thrown) (#1641)"
    
    This reverts commit 23cce8ad35d9af6e2a1cb97fac69fdc0a7f94b42.


 pgjdbc/src/main/java/org/postgresql/core/QueryExecutorBase.java   | 1 +
 pgjdbc/src/test/java/org/postgresql/test/jdbc2/StatementTest.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pgjdbc/src/main/java/org/postgresql/core/QueryExecutorBase.java b/pgjdbc/src/main/java/org/postgresql/core/QueryExecutorBase.java
index 66175f73..82d636c4 100644
--- a/pgjdbc/src/main/java/org/postgresql/core/QueryExecutorBase.java
+++ b/pgjdbc/src/main/java/org/postgresql/core/QueryExecutorBase.java
@@ -185,6 +185,7 @@ public abstract class QueryExecutorBase implements QueryExecutor {
       cancelStream.sendInteger4(cancelPid);
       cancelStream.sendInteger4(cancelKey);
       cancelStream.flush();
+      cancelStream.receiveEOF();
     } catch (IOException e) {
       // Safe to ignore.
       LOGGER.log(Level.FINEST, "Ignoring exception on cancel request:", e);
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/StatementTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/StatementTest.java
index 2441f1b3..e7756a8b 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/StatementTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/StatementTest.java
@@ -903,7 +903,7 @@ public class StatementTest {
     }
   }
 
-  @Test(timeout = 2000)
+  @Test(timeout = 20000)
   public void testFastCloses() throws SQLException {
     ExecutorService executor = Executors.newSingleThreadExecutor();
     con.createStatement().execute("SET SESSION client_min_messages = 'NOTICE'");


[parent: 7da60074916c]