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

CLOUDSTACK-7674 throw an exception when encountered 

Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade430to431.java
This commit is contained in:
Daan Hoogland 2014-10-07 08:05:27 +02:00
parent 0b31732bb1
commit 1de10dd6df
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engine/schema/src/com/cloud/upgrade/dao/Upgrade430to431.java
View File

@ -58,8 +58,8 @@ public class Upgrade430to431 implements DbUpgrade {
private void updateVlanUris(Connection conn) {
s_logger.debug("updating vlan URIs");
Exception thrown = null;
PreparedStatement selectstatement = null;
CloudRuntimeException thrown = null;
PreparedStatement selectstatement = null;
ResultSet results = null;
try{
selectstatement = conn.prepareStatement("SELECT id, vlan_id FROM `cloud`.`vlan` where vlan_id not like '%:%'");
@ -113,6 +113,9 @@ public class Upgrade430to431 implements DbUpgrade {
} //else don't obfuscate the original exception
}
}
if (thrown != null) {
throw thrown;
}
s_logger.debug("Done updateing vlan URIs");
}