github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#4974] Grrrrrr git

Browse Source
This commit is contained in:
lukaseder 2016-01-26 14:44:30 +01:00
parent 6915da57b7
commit 306dc0f24e
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
View File

@ -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",