fix small issues in ConnectionFactoryImpl (#3929)

davecramer · web-flow · commit 6ea732c4984a · 2026-02-06T06:55:09.000-05:00
* fix small issues in ConnectionFactoryImpl
* parse in same order
diff --git a/pgjdbc/src/main/java/org/postgresql/core/v3/ConnectionFactoryImpl.java b/pgjdbc/src/main/java/org/postgresql/core/v3/ConnectionFactoryImpl.java
@@ -220,11 +220,11 @@ private PGStream tryConnect(Properties info, SocketFactory socketFactory, HostSp
       if (protocolVersion != null) {
         int decimal = protocolVersion.indexOf('.');
         if (decimal == -1) {
-          protocolMinor = Integer.parseInt(protocolVersion);
+          protocolMajor = Integer.parseInt(protocolVersion);
           protocolMinor = 0;
         } else {
-          protocolMinor = Integer.parseInt(protocolVersion.substring(decimal + 1));
           protocolMajor = Integer.parseInt(protocolVersion.substring(0,decimal));
+          protocolMinor = Integer.parseInt(protocolVersion.substring(decimal + 1));
         }
       }
 
@@ -754,7 +754,7 @@ private static void doAuthentication(PGStream pgStream, String host, String user
               // do not connect and throw an error
               String errorMessage = "Protocol error, received invalid options: ";
               for (int i = 0; i < numOptionsNotRecognized; i++) {
-                errorMessage  += i > 0 ? "" : "," + pgStream.receiveString();
+                errorMessage  += (i > 0 ? "," : "") + pgStream.receiveString();
               }
               LOGGER.log(Level.FINEST, errorMessage);
               throw new PSQLException(errorMessage, PSQLState.PROTOCOL_VIOLATION);
