Bug 549406 - Stop publishing service.vender propertyY20190805-0900Y20190801-0900Y20190730-0135Y20190730-0055Y20190729-0900I20190806-1800I20190805-1800I20190804-1800I20190803-1800I20190802-1800I20190801-1800I20190801-0600I20190731-1800I20190730-1800I20190729-1800I20190728-1800I20190727-1800I20190726-1800I20190725-1800

This property required parsing and translating the system bundle
manifest.  That takes some time and isn't worth it just to have
a service.vender property that provides little to no value.

Change-Id: I18ae5aeabc204acd87d5c849521bc497160f01c9
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>

1 files changed, 11 insertions, 5 deletions

diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/StorageUtil.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/StorageUtil.java
index bc4f57024..de8f3f794 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/StorageUtil.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/StorageUtil.java
@@ -14,14 +14,22 @@
 
 package org.eclipse.osgi.storage;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.concurrent.TimeUnit;
 import org.eclipse.osgi.internal.debug.Debug;
-import org.osgi.framework.*;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceRegistration;
 
 /**
  * A utility class with some generally useful static methods for adaptor hook implementations
@@ -154,9 +162,7 @@ public class StorageUtil {
 	 * @return the service registration object
 	 */
 	public static ServiceRegistration<?> register(String name, Object service, BundleContext context) {
-		Dictionary<String, Object> properties = new Hashtable<>(7);
-		Dictionary<String, String> headers = context.getBundle().getHeaders();
-		properties.put(Constants.SERVICE_VENDOR, headers.get(Constants.BUNDLE_VENDOR));
+		Dictionary<String, Object> properties = new Hashtable<>();
 		properties.put(Constants.SERVICE_RANKING, Integer.valueOf(Integer.MAX_VALUE));
 		properties.put(Constants.SERVICE_PID, context.getBundle().getBundleId() + "." + service.getClass().getName()); //$NON-NLS-1$
 		return context.registerService(name, service, properties);