etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-8656: reorganise sychronized block

This commit is contained in:
Daan Hoogland 2015-08-14 16:03:17 +02:00
parent 07bee3149c
commit 882de20e1c
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
framework/db/src/com/cloud/utils/db/ConnectionConcierge.java
View File

@ -142,26 +142,17 @@ public class ConnectionConcierge {
} }
protected String testValidity(String name, Connection conn) { protected String testValidity(String name, Connection conn) {
PreparedStatement pstmt = null; if (conn != null) {
try { synchronized (conn) {
if (conn != null) { try (PreparedStatement pstmt = conn.prepareStatement("SELECT 1");) {
synchronized (conn) {
pstmt = conn.prepareStatement("SELECT 1");
pstmt.executeQuery(); pstmt.executeQuery();
} } catch (Throwable th) {
} s_logger.error("Unable to keep the db connection for " + name, th);
return null; return th.toString();
} catch (Throwable th) {
s_logger.error("Unable to keep the db connection for " + name, th);
return th.toString();
} finally {
if (pstmt != null) {
try {
pstmt.close();
} catch (SQLException e) {
} }
} }
} }
return null;
} }
@Override @Override