From 58811ae3e75b966dd7e578dc547752ca2f36be4a Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Mon, 9 Sep 2013 11:40:04 +0200 Subject: [PATCH] [#2643] Routine.execute(Configuration) should restore the original routine state after execution --- .../src/main/java/org/jooq/impl/AbstractRoutine.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java index e622f76a8a..cb43cbbf9b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java @@ -222,9 +222,15 @@ public abstract class AbstractRoutine extends AbstractQueryPart implements Ro @Override public final int execute(Configuration c) { - // Ensure that all depending Attachables are attached - attach(c); - return execute(); + // Ensure that all depending Attachables are attached + Configuration previous = configuration(); + try { + attach(c); + return execute(); + } + finally { + attach(previous); + } } @Override