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

commit    dd71f6f3a1ea31e4b7fb4bf92188a6e87f78c633
Author:   AlexElin <alexey.elin@list.ru>
Commit:   Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date:     Thu Aug 04 15:56:12 2016 +0000

    refactor: fix some hintbugs warnings (#616)
    
    Invocation of toString() on an array
    Inefficient use of keySet() iterator instead of values() iterator
    Inefficient use of keySet() iterator instead of entrySet() iterator
    
    relates to Fix huntbugs warnings #586


 pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java  | 14 ++++++--------
 .../src/main/java/org/postgresql/jdbc/TimestampUtils.java  |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java b/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java
index 088f303c..ddfa6581 100644
--- a/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java
+++ b/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java
@@ -976,12 +976,10 @@ public class PgResultSet implements ResultSet, org.postgresql.PGRefCursorResultS
       insertSQL.append(paramSQL.toString());
       insertStatement = connection.prepareStatement(insertSQL.toString());
 
-      Iterator<String> keys = updateValues.keySet().iterator();
+      Iterator<Object> values = updateValues.values().iterator();
 
-      for (int i = 1; keys.hasNext(); i++) {
-        String key = keys.next();
-        Object o = updateValues.get(key);
-        insertStatement.setObject(i, o);
+      for (int i = 1; values.hasNext(); i++) {
+        insertStatement.setObject(i, values.next());
       }
 
       insertStatement.executeUpdate();
@@ -1688,10 +1686,10 @@ public class PgResultSet implements ResultSet, org.postgresql.PGRefCursorResultS
 
   private void updateRowBuffer() throws SQLException {
 
-    for (String columnName : updateValues.keySet()) {
-      int columnIndex = findColumn(columnName) - 1;
+    for (Map.Entry<String, Object> entry : updateValues.entrySet()) {
+      int columnIndex = findColumn(entry.getKey()) - 1;
 
-      Object valueObject = updateValues.get(columnName);
+      Object valueObject = entry.getValue();
       if (valueObject instanceof PGobject) {
         String value = ((PGobject) valueObject).getValue();
         rowBuffer[columnIndex] = (value == null) ? null : connection.encodeString(value);
diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/TimestampUtils.java b/pgjdbc/src/main/java/org/postgresql/jdbc/TimestampUtils.java
index 7a13c092..c8de034d 100644
--- a/pgjdbc/src/main/java/org/postgresql/jdbc/TimestampUtils.java
+++ b/pgjdbc/src/main/java/org/postgresql/jdbc/TimestampUtils.java
@@ -79,7 +79,7 @@ public class TimestampUtils {
         continue;
       }
       GMT_ZONES.put(pgZoneName + Math.abs(i), timeZone);
-      GMT_ZONES.put(pgZoneName + NUMBERS[Math.abs(i)], timeZone);
+      GMT_ZONES.put(pgZoneName + new String(NUMBERS[Math.abs(i)]), timeZone);
     }
     // Fast path to getting the default timezone.
     // Accessing the default timezone over and over creates a clone with regular API.


[parent: 22c72b4d5908]