commit 0ea9b4e7878af040341e0c063145705fa063b581
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 23 09:37:10 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 23 09:37:10 2022 +0000
tree f3c5b0eac70020b1511e9765601f86a61f16cf7c
parent e9e254d7287e2b7c77570c8f436043ecff8bafcb
parent 14efd94b85629b89a8af3cbe2885634be570c12a

Merge "Fix potential null pointer exception"

javalib/src/android/system/virtualmachine/VirtualMachine.java

diff --git a/javalib/src/android/system/virtualmachine/VirtualMachine.java b/javalib/src/android/system/virtualmachine/VirtualMachine.java
index ae84c08..cc99006 100644
--- a/javalib/src/android/system/virtualmachine/VirtualMachine.java
+++ b/javalib/src/android/system/virtualmachine/VirtualMachine.java
@@ -273,7 +273,7 @@
             throw new VirtualMachineException(e);
         }
 
-        VirtualMachine vm;
+        VirtualMachine vm = null;
         synchronized (sInstancesLock) {
             Map<String, WeakReference<VirtualMachine>> instancesMap;
             if (sInstances.containsKey(context)) {
@@ -285,7 +285,8 @@
 
             if (instancesMap.containsKey(name)) {
                 vm = instancesMap.get(name).get();
-            } else {
+            }
+            if (vm == null) {
                 vm = new VirtualMachine(context, name, config);
                 instancesMap.put(name, new WeakReference<>(vm));
             }