DBTDevice::getServices() shall not throw an exception but return null on error (TinyB API)

1 files changed, 12 insertions, 1 deletions

diff --git a/java/direct_bt/tinyb/DBTDevice.java b/java/direct_bt/tinyb/DBTDevice.java
index f0ab41ea..e2390a51 100644
--- a/java/direct_bt/tinyb/DBTDevice.java
+++ b/java/direct_bt/tinyb/DBTDevice.java
@@ -508,7 +508,18 @@ public class DBTDevice extends DBTObject implements BluetoothDevice
     public native boolean remove() throws BluetoothException;
 
     @Override
-    public native List<BluetoothGattService> getServices();
+    public List<BluetoothGattService> getServices() {
+        try {
+            return getServicesImpl();
+        } catch (final Throwable t) {
+            if(DEBUG) {
+                System.err.println("Caught "+t.getMessage()+" on thread "+Thread.currentThread().toString());
+                t.printStackTrace();
+            }
+        }
+        return null;
+    }
+    private native List<BluetoothGattService> getServicesImpl();
 
     /* property accessors: */