Changeset 35350

Timestamp:

2021-09-08T13:58:35+12:00 (3 years ago)

Author:

davidb

Message:

Code rewritten to avoid try-resource code pattern, as this is not available in JDKs before 1.8

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/GoogleSigninJDBCRealm.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/GoogleSigninJDBCRealm.java

@@ -273 +273 @@
         // invalid login - the above is only used once.
         int numberOfTries = 2;
+
+    // Note: The following code is based on that in JDBCRealm for running SQL queries,
+    //       however, it has by changed from the try-resource code pattern to using
+    //       to a more explictly laid out version so it is compatible with versions
+    //       of JDK prior to 1.8
+    
+    ResultSet rs = null;
         while (numberOfTries > 0) {
             try {
@@ -279 +286 @@
 
                 PreparedStatement stmt = emailToUsername(dbConnection, email_address);
-                try (ResultSet rs = stmt.executeQuery()) {
-                    if (rs.next()) {
-                        dbUsername = rs.getString(1);
-                    }
-
-                    dbConnection.commit();
-
-                    if (dbUsername != null) {
-                        dbUsername = dbUsername.trim();
-                    }
-
-                    return dbUsername;
-                }
-            } catch (SQLException e) {
+        rs = stmt.executeQuery();
+        
+        if (rs.next()) {
+            dbUsername = rs.getString(1);
+        }
+        
+        dbConnection.commit();
+        
+        if (dbUsername != null) {
+            dbUsername = dbUsername.trim();
+        }
+        
+        rs.close();
+        rs = null;
+        
+        return dbUsername;
+        }
+        catch (SQLException e) {
                 // Log the problem for posterity
                 containerLog.error(sm.getString("jdbcRealm.exception"), e);
+        
             }
+
+        if (rs != null) {
+        try {
+            rs.close();
+        }
+        catch (SQLException e) {
+            containerLog.error(sm.getString("jdbcRealm.exception trying to close() ResultSet"), e);
+        }
+        rs = null;
+        }
 
             // Close the connection so that it gets reopened next time