Fixed 1022

evabishchevich · Sep 13, 2016 · b8237b9 · b8237b9
1 parent fd3bcc4
commit b8237b9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/assets/www/jxcore/app.js b/assets/www/jxcore/app.js
@@ -36,7 +36,7 @@ if (process.platform === 'android' || process.platform === 'ios') {
     return;
   }
   //TODO uncomment node tests
-//  return;
+  return;
 }
 
 ThaliMobile.getNetworkStatus()

diff --git a/src/com/test/thalitest/ThaliTestSuite.java b/src/com/test/thalitest/ThaliTestSuite.java
@@ -15,6 +15,6 @@
 
 @RunWith(Suite.class)
 //@Suite.SuiteClasses({ConnectionHelperTest.class,ConnectionModelTest.class,ConnectivityMonitorTest.class,IncomingSocketThreadTest.class,LifeCycleMonitorTest.class,ListenerOrIncomingConnectionTest.class,OutgoingSocketThreadTest.class,SocketThreadBaseTest.class,StartStopOperationHandlerTest.class,StartStopOperationTest.class,StreamCopyingThreadTest.class})
-@Suite.SuiteClasses({ StreamCopyingThreadTest.class})
+@Suite.SuiteClasses({ StartStopOperationHandlerTest.class})
 public class ThaliTestSuite {
 }
diff --git a/src/io/jxcore/node/StartStopOperationHandler.java b/src/io/jxcore/node/StartStopOperationHandler.java
@@ -21,7 +21,7 @@ public class StartStopOperationHandler {
     private final ConnectionManager mConnectionManager;
     private final DiscoveryManager mDiscoveryManager;
     private CountDownTimer mOperationTimeoutTimer = null;
-    private StartStopOperation mCurrentOperation = null;
+    private volatile StartStopOperation mCurrentOperation = null;
 
     /**
      * Constructor.
-Original file line number
+Diff line change
@@ Expand Up @@
         return;
       }
       //TODO uncomment node tests
-    //  return;
+      return;
     }
     ThaliMobile.getNetworkStatus()
@@ Expand Down @@