From 306dc0f24ef51a9234779d092da774e924480ccc Mon Sep 17 00:00:00 2001 From: lukaseder Date: Tue, 26 Jan 2016 14:44:30 +0100 Subject: [PATCH] [#4974] Grrrrrr git --- .../src/main/java/org/jooq/util/AbstractDatabase.java | 10 ---------- 1 file changed, 10 deletions(-) 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 4c16d238cb..a8ea4e43ce 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java @@ -214,21 +214,11 @@ public abstract class AbstractDatabase implements Database { @Override public void executeStart(ExecuteContext ctx) { -<<<<<<< HEAD watch = new StopWatch(); } @Override public void executeEnd(ExecuteContext ctx) { -======= - super.executeStart(ctx); - watch = new StopWatch(); - } - - @Override - public void executeEnd(ExecuteContext ctx) { - super.executeEnd(ctx); ->>>>>>> branch 'master' of https://lukaseder@bitbucket.org/lukaseder/jooq.git if (watch.split() > 5 * 1000 * 1000 * 1000) log.warn( "Slow SQL",