Fix getExistingDiscoveryResult no longer filtering on Thing UID (#4533)

Signed-off-by: Wouter Born <eclipse@maindrain.net>
eclipse-archived · Nov 13, 2017 · bf3d166 · bf3d166
1 parent 96b013c
commit bf3d166
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/...org/eclipse/smarthome/config/setup/test/discovery/DiscoveryServiceRegistryOSGITest.groovy b/...org/eclipse/smarthome/config/setup/test/discovery/DiscoveryServiceRegistryOSGITest.groovy
@@ -438,6 +438,10 @@ class DiscoveryServiceRegistryOSGITest extends OSGiTest {
 
         // verify that the existing DiscoveryResult can be accessed
         assertNotNull extendedDiscoveryServiceMock.discoveryServiceCallback.getExistingDiscoveryResult(thingUID)
+
+        // verify that a non-existing DiscoveryResult can not be accessed
+        thingUID = new ThingUID(EXTENDED_BINDING_ID, EXTENDED_THING_TYPE, "bar")
+        assertNull extendedDiscoveryServiceMock.discoveryServiceCallback.getExistingDiscoveryResult(thingUID)
     }
 
     @Test

diff --git a/...in/java/org/eclipse/smarthome/config/discovery/internal/DiscoveryServiceRegistryImpl.java b/...in/java/org/eclipse/smarthome/config/discovery/internal/DiscoveryServiceRegistryImpl.java
@@ -7,7 +7,7 @@
  */
 package org.eclipse.smarthome.config.discovery.internal;
 
-import static org.eclipse.smarthome.config.discovery.inbox.InboxPredicates.withFlag;
+import static org.eclipse.smarthome.config.discovery.inbox.InboxPredicates.*;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -154,7 +154,8 @@ public DiscoveryResult getExistingDiscoveryResult(ThingUID thingUID) {
                 return null;
             }
             List<DiscoveryResult> ret = new ArrayList<>();
-            ret = inboxReference.stream().filter(withFlag((DiscoveryResultFlag.NEW))).collect(Collectors.toList());
+            ret = inboxReference.stream().filter(withFlag(DiscoveryResultFlag.NEW).and(forThingUID(thingUID)))
+                    .collect(Collectors.toList());
             if (ret.size() > 0) {
                 return ret.get(0);
             } else {