From 43cb9fb52008786dfeeaa80116f4e7e4e57dce1b Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Sun, 6 Jan 2013 17:49:08 +0100
Subject: [PATCH] [#2098] NullPointerException when org.jooq.impl.EnumConverter
 converts null

---
 jOOQ/src/main/java/org/jooq/impl/EnumConverter.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/EnumConverter.java b/jOOQ/src/main/java/org/jooq/impl/EnumConverter.java
index 166e938ce2..93b5cd306f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/EnumConverter.java
+++ b/jOOQ/src/main/java/org/jooq/impl/EnumConverter.java
@@ -83,7 +83,10 @@ public class EnumConverter<T, U extends Enum<U>> implements Converter<T, U> {
      */
     @Override
     public T to(U userObject) {
-        if (enumType == EnumType.ORDINAL) {
+        if (userObject == null) {
+            return null;
+        }
+        else if (enumType == EnumType.ORDINAL) {
             return convert(userObject.ordinal(), fromType);
         }
         else {