From 2a235ff56902ebb6cc3d38b349d3902fdf024de3 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Sat, 1 Sep 2012 10:20:33 +0200 Subject: [PATCH] Store SchemaMapping to local variable --- jOOQ/src/main/java/org/jooq/impl/Util.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/Util.java b/jOOQ/src/main/java/org/jooq/impl/Util.java index f951c82733..6b2b35af3d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Util.java +++ b/jOOQ/src/main/java/org/jooq/impl/Util.java @@ -77,6 +77,7 @@ import org.jooq.QueryPart; import org.jooq.Record; import org.jooq.RenderContext; import org.jooq.Schema; +import org.jooq.SchemaMapping; import org.jooq.Table; import org.jooq.UDT; import org.jooq.UDTRecord; @@ -940,8 +941,10 @@ final class Util { */ @SuppressWarnings("deprecation") static final Schema getMappedSchema(Configuration configuration, Schema schema) { - if (configuration.getSchemaMapping() != null) { - return configuration.getSchemaMapping().map(schema); + SchemaMapping mapping = configuration.getSchemaMapping(); + + if (mapping != null) { + return mapping.map(schema); } else { return schema; @@ -953,8 +956,10 @@ final class Util { */ @SuppressWarnings("deprecation") static final Table getMappedTable(Configuration configuration, Table table) { - if (configuration.getSchemaMapping() != null) { - return configuration.getSchemaMapping().map(table); + SchemaMapping mapping = configuration.getSchemaMapping(); + + if (mapping != null) { + return mapping.map(table); } else { return table;