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

CID-1254838 catch individual exceptions types

Browse Source
This commit is contained in:
Daan Hoogland 2014-11-17 15:09:03 +01:00
parent 7b9e4a820b
commit 7aa64b9efa
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
View File

@ -35,6 +35,7 @@ import org.apache.cloudstack.storage.to.TemplateObjectTO;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.apache.xmlrpc.XmlRpcException;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.to.DataObjectType;
@ -54,6 +55,8 @@ import com.xensource.xenapi.PBD;
import com.xensource.xenapi.SR;
import com.xensource.xenapi.Task;
import com.xensource.xenapi.Types;
import com.xensource.xenapi.Types.BadServerResponse;
import com.xensource.xenapi.Types.XenAPIException;
import com.xensource.xenapi.VDI;
public class Xenserver625StorageProcessor extends XenServerStorageProcessor {
@ -1099,10 +1102,22 @@ public class Xenserver625StorageProcessor extends XenServerStorageProcessor {
result = true;
return new CopyCmdAnswer(newTemplate);
} catch (Exception ex) {
s_logger.error("Failed to create a template from a snapshot", ex);
// } catch (Exception ex) {
// s_logger.error("Failed to create a template from a snapshot", ex);
//
// return new CopyCmdAnswer("Failed to create a template from a snapshot: " + ex.toString());
} catch (BadServerResponse e) {
s_logger.error("Failed to create a template from a snapshot due to incomprehensible server response", e);
return new CopyCmdAnswer("Failed to create a template from a snapshot: " + ex.toString());
return new CopyCmdAnswer("Failed to create a template from a snapshot: " + e.toString());
} catch (XenAPIException e) {
s_logger.error("Failed to create a template from a snapshot due to xenapi error", e);
return new CopyCmdAnswer("Failed to create a template from a snapshot: " + e.toString());
} catch (XmlRpcException e) {
s_logger.error("Failed to create a template from a snapshot due to rpc error", e);
return new CopyCmdAnswer("Failed to create a template from a snapshot: " + e.toString());
} finally {
if (!result) {
if (destVdi != null) {