fix: backpatch2142 read notifies or errors that come in asynchronousl…

…y after the ready for query (#2168)

pgjdbc/src/main/java/org/postgresql/core/v3/QueryExecutorImpl.java

@@ -291,7 +291,19 @@ public synchronized void execute(Query query, @Nullable ParameterList parameters
       LOGGER.log(Level.FINEST, "  simple execute, handler={0}, maxRows={1}, fetchSize={2}, flags={3}",
           new Object[]{handler, maxRows, fetchSize, flags});
     }
-
+    try {
+      if (pgStream.hasMessagePending()) {
+        if (pgStream.peekChar() == 'N') {
+          pgStream.receiveChar();
+          handler.handleWarning(receiveNoticeResponse());
+        } else if (pgStream.peekChar() == 'E') {
+          pgStream.receiveChar();
+          throw receiveErrorResponse();
+        }
+      }
+    }  catch ( IOException ex ) {
+      throw new SQLException(ex);
+    }
     if (parameters == null) {
       parameters = SimpleQuery.NO_PARAMETERS;
     }
@@ -2312,6 +2324,7 @@ protected void processResults(ResultHandler handler, int flags) throws IOExcepti
         }
 
         case 'N': // Notice Response
+          LOGGER.log(Level.FINEST, " <=BE Notice");
           SQLWarning warning = receiveNoticeResponse();
           handler.handleWarning(warning);
           break;
@@ -2369,7 +2382,16 @@ && castNonNull(pendingExecuteQueue.peekFirst()).asSimple) {
             }
           }
           endQuery = true;
-
+          if (pgStream.hasMessagePending()) {
+            if (pgStream.peekChar() == 'N') {
+              pgStream.receiveChar();
+              handler.handleWarning(receiveNoticeResponse());
+            }
+            if (pgStream.peekChar() == 'E') {
+              pgStream.receiveChar();
+              handler.handleError(receiveErrorResponse());
+            }
+          }
           // Reset the statement name of Parses that failed.
           while (!pendingParseQueue.isEmpty()) {
             SimpleQuery failedQuery = pendingParseQueue.removeFirst();

pgjdbc/src/main/java/org/postgresql/util/PSQLState.java

@@ -105,6 +105,8 @@ public enum PSQLState {
   SYSTEM_ERROR("60000"),
   IO_ERROR("58030"),
 
+  ERROR_CODE_CRASH_SHUTDOWN("57P02"),
+
   UNEXPECTED_ERROR("99999");
 
   private final String state;

pgjdbc/src/test/java/org/postgresql/test/jdbc2/CopyTest.java

@@ -440,7 +440,8 @@ public void testLockReleaseOnCancelFailure() throws SQLException, InterruptedExc
     if (rollbackException == null) {
       fail("rollback should have thrown an exception");
     }
-    acceptIOCause(rollbackException);
+
+    assertTrue( rollbackException instanceof SQLException);
   }
 
   private static class Rollback extends Thread {