|
 |
c90b3b |
From 006d5e833eae44aab2514918acfe20f8ab3992d2 Mon Sep 17 00:00:00 2001
|
|
|
c90b3b |
From: Mat Booth <mat.booth@redhat.com>
|
|
|
c90b3b |
Date: Tue, 12 Mar 2019 15:12:37 +0000
|
|
|
c90b3b |
Subject: [PATCH 2/4] Allow bootstrapping against OSGi Core R6
|
|
|
c90b3b |
|
|
|
c90b3b |
---
|
|
|
c90b3b |
.../http/servlet/internal/HttpServiceRuntimeImpl.java | 8 ++++++--
|
|
|
c90b3b |
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
c90b3b |
|
|
|
c90b3b |
diff --git a/rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceRuntimeImpl.java b/rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceRuntimeImpl.java
|
|
|
c90b3b |
index 8d07030b8..530f5bb11 100644
|
|
|
c90b3b |
--- a/rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceRuntimeImpl.java
|
|
|
c90b3b |
+++ b/rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceRuntimeImpl.java
|
|
|
c90b3b |
@@ -1341,8 +1341,12 @@ public class HttpServiceRuntimeImpl
|
|
|
c90b3b |
@Override
|
|
|
c90b3b |
public Void call() {
|
|
|
c90b3b |
try {
|
|
|
c90b3b |
- Dictionary<String,Object> properties = getHsrRegistration().getReference().getProperties();
|
|
|
c90b3b |
- properties.put(Constants.SERVICE_CHANGECOUNT, getServiceChangecount());
|
|
|
c90b3b |
+ Dictionary<String,Object> properties = new Hashtable<String,Object>();
|
|
|
c90b3b |
+ String[] keys = getHsrRegistration().getReference().getPropertyKeys();
|
|
|
c90b3b |
+ for (String key : keys) {
|
|
|
c90b3b |
+ properties.put(key, getHsrRegistration().getReference().getProperty(key));
|
|
|
c90b3b |
+ }
|
|
|
c90b3b |
+ properties.put("service.changecount", getServiceChangecount());
|
|
|
c90b3b |
getHsrRegistration().setProperties(properties);
|
|
|
c90b3b |
return null;
|
|
|
c90b3b |
}
|
|
|
c90b3b |
--
|
|
|
c90b3b |
2.26.2
|
|
|
c90b3b |
|