C++/Java Scanner 10: Refine found/connect criteria: Also in EUI48_ANY_DEVICE case, skip devices-in-processing

2 files changed, 15 insertions, 16 deletions

diff --git a/examples/direct_bt_scanner10/dbt_scanner10.cpp b/examples/direct_bt_scanner10/dbt_scanner10.cpp
index 1197d50b..eb6222f2 100644
--- a/examples/direct_bt_scanner10/dbt_scanner10.cpp
+++ b/examples/direct_bt_scanner10/dbt_scanner10.cpp
@@ -120,10 +120,9 @@ class MyAdapterStatusListener : public AdapterStatusListener {
             fprintf(stderr, "****** FOUND__-2: Skip non public LE %s\n", device->toString(true).c_str());
             return;
         }
-        if( waitForDevice == EUI48_ANY_DEVICE ||
-            ( waitForDevice == device->address &&
-              !isDeviceProcessed(waitForDevice) &&
-              !isDeviceProcessing(waitForDevice)
+        if( !isDeviceProcessing( device->getAddress() ) &&
+            ( waitForDevice == EUI48_ANY_DEVICE ||
+              ( waitForDevice == device->getAddress() && !isDeviceProcessed(waitForDevice) )
             ) )
         {
             fprintf(stderr, "****** FOUND__-0: Connecting %s\n", device->toString(true).c_str());
@@ -147,10 +146,9 @@ class MyAdapterStatusListener : public AdapterStatusListener {
             return;
         }
 
-        if( waitForDevice == EUI48_ANY_DEVICE ||
-            ( waitForDevice == device->address &&
-              !isDeviceProcessed(waitForDevice) &&
-              !isDeviceProcessing(waitForDevice)
+        if( !isDeviceProcessing( device->getAddress() ) &&
+            ( waitForDevice == EUI48_ANY_DEVICE ||
+              ( waitForDevice == device->getAddress() && !isDeviceProcessed(waitForDevice) )
             ) )
         {
             fprintf(stderr, "****** CONNECTED-0: Processing %s\n", device->toString(true).c_str());
@@ -299,6 +297,7 @@ exit:
         device->getAdapter().startDiscovery( true );
     }
     removeFromDevicesProcessing(device->getAddress());
+
     fprintf(stderr, "****** Processing Device: End: Success %d on %s\n", success, device->toString().c_str());
     if( success ) {
         addToDevicesProcessed(device->getAddress());
@@ -329,6 +328,8 @@ int main(int argc, char *argv[])
             USE_WHITELIST = true;
         }
     }
+    fprintf(stderr, "pid %d\n", getpid());
+
     fprintf(stderr, "Run with '[-dev_id <adapter-index>] [-mac <device_address>] (-wl <device_address>)*'");
 
     fprintf(stderr, "USE_WHITELIST %d\n", USE_WHITELIST);
diff --git a/examples/java/ScannerTinyB10.java b/examples/java/ScannerTinyB10.java
index 1a97ea84..2f81f54d 100644
--- a/examples/java/ScannerTinyB10.java
+++ b/examples/java/ScannerTinyB10.java
@@ -91,10 +91,9 @@ public class ScannerTinyB10 {
                 System.err.println("****** FOUND__-2: Skip non public LE "+device.toString());
                 return;
             }
-            if( waitForDevice.equals(EUI48_ANY_DEVICE) ||
-                ( waitForDevice.equals(device.getAddress()) &&
-                  !devicesProcessed.contains(waitForDevice) &&
-                  !devicesInProcessing.contains(waitForDevice)
+            if( !devicesInProcessing.contains( device.getAddress() ) &&
+                ( waitForDevice.equals(EUI48_ANY_DEVICE) ||
+                  ( waitForDevice.equals(device.getAddress()) && !devicesProcessed.contains(waitForDevice) )
                 ) )
             {
                 System.err.println("****** FOUND__-0: Connecting "+device.toString());
@@ -125,10 +124,9 @@ public class ScannerTinyB10 {
                 return;
             }
 
-            if( waitForDevice.equals(EUI48_ANY_DEVICE) ||
-                ( waitForDevice.equals(device.getAddress()) &&
-                  !devicesProcessed.contains(waitForDevice) &&
-                  !devicesInProcessing.contains(waitForDevice)
+            if( !devicesInProcessing.contains( device.getAddress() ) &&
+                ( waitForDevice.equals(EUI48_ANY_DEVICE) ||
+                  ( waitForDevice.equals(device.getAddress()) && !devicesProcessed.contains(waitForDevice) )
                 ) )
             {
                 System.err.println("****** CONNECTED-0: Processing "+device.toString());