summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorSteffen Ritter2022-06-28 15:23:09 +0200
committerSteffen Ritter2022-06-28 15:23:09 +0200
commit5b9cfb58281159754c69c54e21f986764c4e9502 (patch)
tree08ba5ab5fe7e3825a2dc3c0300a12d642fd5a108 /src/main
parent[AppUtil] logHeader: Print VM bitness (diff)
downloadmaster-sync-shared-5b9cfb58281159754c69c54e21f986764c4e9502.tar.gz
master-sync-shared-5b9cfb58281159754c69c54e21f986764c4e9502.tar.xz
master-sync-shared-5b9cfb58281159754c69c54e21f986764c4e9502.zip
Add vmware virtualHW.version=19 and catch NPE
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/openslx/virtualization/configuration/VirtualizationConfiguration.java6
-rw-r--r--src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVmware.java3
2 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfiguration.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfiguration.java
index 165b80b..d3b0191 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfiguration.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfiguration.java
@@ -150,7 +150,11 @@ public abstract class VirtualizationConfiguration
@Override
public boolean isActive()
{
- return getVirtualizerVersion().equals( version );
+ try {
+ return getVirtualizerVersion().equals( version );
+ } catch (NullPointerException e) {
+ return false;
+ }
}
@Override
diff --git a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVmware.java b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVmware.java
index 9fe31a5..e6255e8 100644
--- a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVmware.java
+++ b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVmware.java
@@ -46,7 +46,8 @@ public class VirtualizerVmware extends Virtualizer
new Version( Short.valueOf( "15" ), "Workstation/Player 15, Fusion 11" ),
new Version( Short.valueOf( "16" ), "Workstation/Player 15.1, Fusion 11.1" ),
new Version( Short.valueOf( "17" ), "Workstation/Player 16, Fusion 12" ),
- new Version( Short.valueOf( "18" ), "Workstation/Player 16.1, Fusion 12.1" ) ) );
+ new Version( Short.valueOf( "18" ), "Workstation/Player 16.1, Fusion 12.1" ),
+ new Version( Short.valueOf( "19" ), "Workstation/Player 16.2, Fusion 12.2" ) ) );
/**
* Creates a new VMware virtualizer.