[#7076] ForcedType enum with no matching value being converted

to last enum value
jOOQ · Nov 24, 2022 · a59e85c · a59e85c
1 parent de14554
commit a59e85c
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/jOOQ/src/main/java/org/jooq/impl/EnumConverter.java b/jOOQ/src/main/java/org/jooq/impl/EnumConverter.java
@@ -72,13 +72,20 @@ public EnumConverter(Class<T> fromType, Class<U> toType, Function<? super U, ? e
         this.to = to;
         this.lookup = new LinkedHashMap<>();
 
-        for (U u : toType.getEnumConstants())
-            this.lookup.put(to(u), u);
+        for (U u : toType.getEnumConstants()) {
+            T key = to(u);
+
+            if (key != null)
+                this.lookup.put(key, u);
+        }
     }
 
     @Override
     public final U from(T databaseObject) {
-        return lookup.get(databaseObject);
+        if (databaseObject == null)
+            return null;
+        else
+            return lookup.get(databaseObject);
     }
 
     /**