Merge pull request #1232 from TheBlueMatt/lockcontention

Fix DEBUG_LOCKCONTENTION

src/util.h

@@ -217,9 +217,11 @@ public:
             {
                 printf("LOCKCONTENTION: %s\n", pszName);
                 printf("Locker: %s:%d\n", pszFile, nLine);
-            }
 #endif
             lock.lock();
+#ifdef DEBUG_LOCKCONTENTION
+            }
+#endif
         }
     }