summaryrefslogtreecommitdiffstats
path: root/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/App.java
diff options
context:
space:
mode:
authorManuel Bentele2021-07-01 11:31:48 +0200
committerManuel Bentele2021-07-01 11:31:48 +0200
commit19dd94ebe858d3579f414f7d7323b317937ba623 (patch)
treec058a9bec3681af2b62ef10735e9e3354a8c7c05 /core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/App.java
parentMerge branch 'master' into installer (diff)
parent[qemu] Handle 'NullPointerException' if config filenames are missing (diff)
downloadmltk-19dd94ebe858d3579f414f7d7323b317937ba623.tar.gz
mltk-19dd94ebe858d3579f414f7d7323b317937ba623.tar.xz
mltk-19dd94ebe858d3579f414f7d7323b317937ba623.zip
Merge branch 'master' into installer
Diffstat (limited to 'core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/App.java')
-rw-r--r--core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/App.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/App.java b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/App.java
index 5ea7b720..c9d47f5e 100644
--- a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/App.java
+++ b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/App.java
@@ -113,7 +113,8 @@ public class App
try {
final File xmlInputFile = new File( xmlInputFileName );
config = new Domain( xmlInputFile );
- } catch ( LibvirtXmlDocumentException | LibvirtXmlSerializationException | LibvirtXmlValidationException e ) {
+ } catch ( NullPointerException | LibvirtXmlDocumentException | LibvirtXmlSerializationException
+ | LibvirtXmlValidationException e ) {
LOGGER.error( "Failed to read VM input configuration file: " + e.getLocalizedMessage() );
hypervisor.close();
System.exit( 3 );
@@ -159,7 +160,7 @@ public class App
try {
final File xmlOutputFile = new File( xmlOutputFileName );
config.toXml( xmlOutputFile );
- } catch ( LibvirtXmlSerializationException e ) {
+ } catch ( NullPointerException | LibvirtXmlSerializationException e ) {
LOGGER.error( "Failed to write VM output configuration file: " + e.getLocalizedMessage() );
hypervisor.close();
System.exit( 5 );