From 7b77a24331a6bb52afcda5acc70114cd67ec4fbd Mon Sep 17 00:00:00 2001 From: lukaseder Date: Tue, 29 Aug 2017 10:39:20 +0200 Subject: [PATCH] [#6537] NullPointerException in AbstractRecord.intern0() --- jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java index b6f58ff05b..a7367a0181 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java @@ -375,8 +375,8 @@ abstract class AbstractRecord extends AbstractStore implements Record { safeIndex(fieldIndex); if (field(fieldIndex).getType() == String.class) { - values[fieldIndex] = ((String) values[fieldIndex]).intern(); - originals[fieldIndex] = ((String) originals[fieldIndex]).intern(); + values[fieldIndex] = intern((String) values[fieldIndex]); + originals[fieldIndex] = intern((String) originals[fieldIndex]); } } @@ -387,6 +387,10 @@ abstract class AbstractRecord extends AbstractStore implements Record { throw new IllegalArgumentException("No field at index " + index + " in Record type " + fieldsRow()); } + final String intern(String string) { + return string == null ? null : string.intern(); + } + /** * Subclasses may override this */