From bcd684dabbbe8c4c4130c486b2e83c3c7d9e0052 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Thu, 28 Feb 2019 15:56:08 +0100 Subject: [PATCH] [#7591] Refactor calls to DefaultExecuteContext.register() to use ResourceManagingScope.autoFree() instead --- jOOQ/src/main/java/org/jooq/impl/BlobBinding.java | 8 ++------ jOOQ/src/main/java/org/jooq/impl/ClobBinding.java | 8 ++------ jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java | 4 ++-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/BlobBinding.java b/jOOQ/src/main/java/org/jooq/impl/BlobBinding.java index fe00cb5083..d48523d458 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BlobBinding.java +++ b/jOOQ/src/main/java/org/jooq/impl/BlobBinding.java @@ -91,16 +91,12 @@ public class BlobBinding implements Binding { @Override public final void set(BindingSetStatementContext ctx) throws SQLException { - Blob blob = newBlob(ctx.configuration(), ctx.value()); - DefaultExecuteContext.register(blob); - ctx.statement().setBlob(ctx.index(), blob); + ctx.statement().setBlob(ctx.index(), ctx.autoFree(newBlob(ctx.configuration(), ctx.value()))); } @Override public final void set(BindingSetSQLOutputContext ctx) throws SQLException { - Blob blob = newBlob(ctx.configuration(), ctx.value()); - DefaultExecuteContext.register(blob); - ctx.output().writeBlob(blob); + ctx.output().writeBlob(ctx.autoFree(newBlob(ctx.configuration(), ctx.value()))); } @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/ClobBinding.java b/jOOQ/src/main/java/org/jooq/impl/ClobBinding.java index b073978eac..1f0d9047fc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ClobBinding.java +++ b/jOOQ/src/main/java/org/jooq/impl/ClobBinding.java @@ -91,16 +91,12 @@ public class ClobBinding implements Binding { @Override public final void set(BindingSetStatementContext ctx) throws SQLException { - Clob clob = newClob(ctx.configuration(), ctx.value()); - DefaultExecuteContext.register(clob); - ctx.statement().setClob(ctx.index(), clob); + ctx.statement().setClob(ctx.index(), ctx.autoFree(newClob(ctx.configuration(), ctx.value()))); } @Override public final void set(BindingSetSQLOutputContext ctx) throws SQLException { - Clob clob = newClob(ctx.configuration(), ctx.value()); - DefaultExecuteContext.register(clob); - ctx.output().writeClob(clob); + ctx.output().writeClob(ctx.autoFree(newClob(ctx.configuration(), ctx.value()))); } @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java index fac40b655b..2307b81d7b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java @@ -1349,8 +1349,6 @@ public class DefaultBinding implements Binding { - - @@ -1787,6 +1785,7 @@ public class DefaultBinding implements Binding { + ctx.output().writeBytes(value); @@ -3535,6 +3534,7 @@ public class DefaultBinding implements Binding { + ctx.output().writeString(value);