commit 568642c463239e8081c93eead94cb010cc598bcf
author Tim Ward <timothyjward@apache.org> Tue Sep 14 16:04:34 2021 +0100
committer Tim Ward <timothyjward@apache.org> Tue Sep 14 16:16:45 2021 +0100
tree 3044efcf4d98d26fbe09fa2d21efa14551464075
parent f2d25032e8c6039dbbc51131904c78d1e6933024

Ensure that Export References are closed when the service unregisters

rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java

diff --git a/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java b/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java
index cc6349c..93f73e7 100644
--- a/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java
+++ b/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java
@@ -501,8 +501,8 @@
         synchronized (exportedServices) {
             for (Collection<ExportRegistration> value : exportedServices.values()) {
                 for (ExportRegistration er : value) {
-                    if (er.getException() != null &&
-                            er.getExportReference() != null &&
+                    if (er.getException() != null ||
+                            er.getExportReference() == null ||
                             er.getExportReference().getExportedService().equals(sref)) {
                         regs.add(er);
                     }