commit 80f93e120f21c620a729c8846fcab48798122cfe
author Carsten Ziegeler <cziegele@adobe.com> Thu Feb 01 10:25:08 2018 +0100
committer Carsten Ziegeler <cziegele@adobe.com> Thu Feb 01 10:25:08 2018 +0100
tree 432cf1a400669a96564405289c6d3bed29cea21a
parent 0ff9fbfbbbb1c5c0386cba96a079c7f3ce1ed69d

SLING-7461 : Official endpoints property from Http Whiteboard should be used

src/main/java/org/apache/sling/discovery/impl/support/StandardPropertyProvider.java

diff --git a/src/main/java/org/apache/sling/discovery/impl/support/StandardPropertyProvider.java b/src/main/java/org/apache/sling/discovery/impl/support/StandardPropertyProvider.java
index 9358688..e17c582 100644
--- a/src/main/java/org/apache/sling/discovery/impl/support/StandardPropertyProvider.java
+++ b/src/main/java/org/apache/sling/discovery/impl/support/StandardPropertyProvider.java
@@ -51,8 +51,11 @@
            policy=ReferencePolicy.DYNAMIC)
 public class StandardPropertyProvider {
 
+    /** Official Endpoint service registration property fromhttp whiteboard spec */
+    private static final String REG_PROPERTY_ENDPOINTS = "osgi.http.endpoints";
+
     /** Endpoint service registration property from RFC 189 */
-    private static final String REG_PROPERTY_ENDPOINTS = "osgi.http.service.endpoints";
+    private static final String REG_PROPERTY_ENDPOINTS_RFC = "osgi.http.service.endpoints";
 
     private volatile long changeCount;
 
@@ -106,6 +109,7 @@
         this.propagationService = cc.getBundleContext().registerService(PropertyProvider.class.getName(),
                 new PropertyProvider() {
 
+                    @Override
                     public String getProperty(final String name) {
                         if ( InstanceDescription.PROPERTY_DESCRIPTION.equals(name) ) {
                             return settings.getSlingDescription();
@@ -133,7 +137,10 @@
      * Bind a http service
      */
     protected void bindHttpService(final ServiceReference reference) {
-        final String[] endpointUrls = toStringArray(reference.getProperty(REG_PROPERTY_ENDPOINTS));
+        String[] endpointUrls = toStringArray(reference.getProperty(REG_PROPERTY_ENDPOINTS));
+        if ( endpointUrls == null ) {
+            endpointUrls = toStringArray(reference.getProperty(REG_PROPERTY_ENDPOINTS_RFC));
+        }
         if ( endpointUrls != null ) {
             synchronized ( this.endpoints ) {
                 this.endpoints.put((Long)reference.getProperty(Constants.SERVICE_ID), endpointUrls);