From 916a6d0104b1e33eda495f987fa08f123c2207f6 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Sat, 20 Jun 2015 00:16:19 +0200 Subject: [PATCH] findbugs: prepare prepared statements to leverage the advantages of'em Signed-off-by: Daan Hoogland This closes #496 --- .../cloud/configuration/ConfigurationManagerImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 315fa8c9cb2..50e120a1720 100644 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -929,7 +929,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati String selectSql = "SELECT * FROM `?`.`?` WHERE ? = ?"; if(tableName.equals("vm_instance")) { - selectSql += " AND state != '" + VirtualMachine.State.Expunging.toString() + "' AND removed IS NULL"; + selectSql += " AND state != ? AND removed IS NULL"; } if (tableName.equals("host") || tableName.equals("cluster") || tableName.equals("volumes")) { @@ -943,6 +943,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati stmt.setString(2,tableName); stmt.setString(3,column); stmt.setLong(4, podId); + if(tableName.equals("vm_instance")) { + stmt.setString(5, VirtualMachine.State.Expunging.toString()); + } final ResultSet rs = stmt.executeQuery(); if (rs != null && rs.next()) { throw new CloudRuntimeException("The pod cannot be deleted because " + errorMsg); @@ -1407,7 +1410,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } if (tableName.equals("vm_instance")) { - selectSql += " AND state != '" + VirtualMachine.State.Expunging.toString() + "' AND removed IS NULL"; + selectSql += " AND state != ? AND removed IS NULL"; } final TransactionLegacy txn = TransactionLegacy.currentTxn(); @@ -1417,6 +1420,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati stmt.setString(2,tableName); stmt.setString(3,column); stmt.setLong(4, zoneId); + if (tableName.equals("vm_instance")) { + stmt.setString(5, VirtualMachine.State.Expunging.toString()); + } final ResultSet rs = stmt.executeQuery(); if (rs != null && rs.next()) { throw new CloudRuntimeException("The zone is not deletable because " + errorMsg);