apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleaning up more conflicts

Browse Source
This commit is contained in:
Anthony Xu 2014-09-24 10:28:04 -07:00 committed by David Nalley
parent b4bddc61ac
commit d036168ecb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
framework/db/src/com/cloud/utils/db/Merovingian2.java
View File

@ -138,9 +138,9 @@ public class Merovingian2 extends StandardMBean implements MerovingianMBean {
} catch (InterruptedException e) {
}
}
if (s_logger.isTraceEnabled()) {
s_logger.trace("Timed out on acquiring lock " + key + ". Waited for " + (InaccurateClock.getTime() - startTime));
}
String msg = "Timed out on acquiring lock " + key + " . Waited for " + ((InaccurateClock.getTime() - startTime)/1000) + "seconds";
Exception e = new CloudRuntimeException(msg);
s_logger.warn(msg, e);
return false;
}
@ -270,7 +270,9 @@ public class Merovingian2 extends StandardMBean implements MerovingianMBean {
throw new CloudRuntimeException("release:Exception:"+ e.getMessage(), e);
}
} else if (rows < 1) {
s_logger.warn("Was unable to find lock for the key " + key + " and thread id " + threadId);
String msg = ("Was unable to find lock for the key " + key + " and thread id " + threadId);
Exception e = new CloudRuntimeException(msg);
s_logger.warn(msg, e);
}
return rows == 1;
} catch (Exception e) {