From 8a3f32f6354abe299ceb7cf8f6e5efa1dce2da76 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Tue, 22 Dec 2015 15:04:36 +0100 Subject: [PATCH] [#4598] Fixed regression in generated code --- .../src/main/java/org/jooq/util/AbstractDatabase.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java index fb38e0d6f4..aeabc9d45b 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java @@ -590,6 +590,11 @@ public abstract class AbstractDatabase implements Database { @Override public final CustomType getConfiguredCustomType(String typeName) { + + // The user type name that is passed here can be null. + if (typeName == null) + return null; + Iterator it1 = configuredCustomTypes.iterator(); while (it1.hasNext()) { @@ -639,7 +644,7 @@ public abstract class AbstractDatabase implements Database { } } - if (StringUtils.equals(type.getUserType(), typeName)) { + if (type.getUserType() != null && StringUtils.equals(type.getUserType(), typeName)) { return customType(this, type); } }