Merge pull request #77 from eighthave/volatile

use "volatile" for key variables that are accessed across threads
guardianproject · Apr 24, 2022 · 95eca2a · 95eca2a
2 parents 31422fb + dc2e19e
commit 95eca2a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tor-android-binary/src/main/java/org/torproject/jni/TorService.java b/tor-android-binary/src/main/java/org/torproject/jni/TorService.java
@@ -192,7 +192,7 @@ private static File getAppTorServiceDataDir(Context context) {
     private long torConfiguration = -1;
     private int torControlFd = -1;
 
-    private TorControlConnection torControlConnection;
+    private volatile TorControlConnection torControlConnection;
 
     /**
      * This lock must be acquired before calling createTorConfiguration() and
@@ -310,7 +310,7 @@ public void onEvent(int event, @Nullable String name) {
         }
     };
 
-    private CountDownLatch controlPortThreadStarted;
+    private volatile CountDownLatch controlPortThreadStarted;
 
     private int getPortFromGetInfo(String key) {
         final String value = getInfo(key);