aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpierantoniomerlino <[email protected]>2017-08-30 11:22:57 +0200
committerpetreeftime <[email protected]>2017-09-07 09:46:46 +0300
commit753734553741888fc776130e9bde0afe167e1eb9 (patch)
treedd3d81c6d2a5f2421278311017b30d371581ef17
parent6fb269fb2cb34a4fdb5788076ae0c35e9e06b187 (diff)
Removed System.exit from BluetoothManager
Signed-off-by: pierantoniomerlino <[email protected]>
-rw-r--r--java/BluetoothManager.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/java/BluetoothManager.java b/java/BluetoothManager.java
index c8f3cdb9..222cf540 100644
--- a/java/BluetoothManager.java
+++ b/java/BluetoothManager.java
@@ -43,7 +43,6 @@ public class BluetoothManager
System.loadLibrary("javatinyb");
} catch (UnsatisfiedLinkError e) {
System.err.println("Native code library failed to load.\n" + e);
- System.exit(-1);
}
}
@@ -297,8 +296,6 @@ public class BluetoothManager
{
if (inst == null)
{
- inst = new BluetoothManager();
- inst.init();
String nativeAPIVersion = getNativeAPIVersion();
String APIVersion = BluetoothManager.class.getPackage().getSpecificationVersion();
if (APIVersion.equals(nativeAPIVersion) == false) {
@@ -318,6 +315,8 @@ public class BluetoothManager
System.err.println("Java library is out of date. Please update the Java library.");
else System.err.println("Native library is out of date. Please update the native library.");
}
+ inst = new BluetoothManager();
+ inst.init();
}
return inst;
}