Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)

62930: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62626: Build fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62985 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-20 14:45:36 +00:00
parent 3168485452
commit 3e55fd9ca1

View File

@@ -175,6 +175,10 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
} }
catch(QueryModelException qme) catch(QueryModelException qme)
{ {
if(stopWatch.isRunning())
{
stopWatch.stop();
}
// MNT-10323: Logging configuration on JBoss leads to clogging of the log with a lot of these errors because of INFO level when WQS module is installed // MNT-10323: Logging configuration on JBoss leads to clogging of the log with a lot of these errors because of INFO level when WQS module is installed
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {