Fix NullPointerException in getUuidFromString (#180)

rainbowdashlabs · May 22, 2024 · 8fbc603 · 8fbc603
1 parent 9e24cef
commit 8fbc603
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/sadu-mapper/src/main/java/de/chojo/sadu/mapper/wrapper/Row.java b/sadu-mapper/src/main/java/de/chojo/sadu/mapper/wrapper/Row.java
@@ -127,7 +127,11 @@ public <T extends Enum<T>> T getEnum(int columnIndex, Class<T> clazz) throws SQL
      *                                  described in {@link #toString}
      */
     public UUID getUuidFromString(int columnIndex) throws SQLException {
-        return UUID.fromString(resultSet.getString(columnIndex));
+        var value = resultSet.getString(columnIndex);
+        if (value == null) {
+            return null;
+        }
+        return UUID.fromString(value);
     }
 
     /**
@@ -542,7 +546,11 @@ public <T extends Enum<T>> T getEnum(String columnLabel, Class<T> clazz) throws
      *                      called on a closed result set
      */
     public UUID getUuidFromString(String columnLabel) throws SQLException {
-        return UUID.fromString(resultSet.getString(columnAlias(columnLabel)));
+        var value = resultSet.getString(columnAlias(columnLabel));
+        if (value == null) {
+            return null;
+        }
+        return UUID.fromString(value);
     }
 
     /**