469663: Missing update site causes NPE in feature computation
Bug: 469663
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=469663
diff --git a/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/ServiceLocator.java b/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/ServiceLocator.java
index 8cf8236..3d22c75 100644
--- a/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/ServiceLocator.java
+++ b/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/ServiceLocator.java
@@ -238,7 +238,12 @@
public static Map<String, String> computeDefaultRequestMetaParameters() {
Map<String, String> requestMetaParameters = new HashMap<String, String>();
+
requestMetaParameters.put(DefaultMarketplaceService.META_PARAM_CLIENT, MarketplaceClientCore.BUNDLE_ID);
+ Bundle clientBundle = Platform.getBundle(MarketplaceClientCore.BUNDLE_ID);
+ requestMetaParameters.put(DefaultMarketplaceService.META_PARAM_CLIENT_VERSION, clientBundle.getVersion()
+ .toString());
+
requestMetaParameters.put(DefaultMarketplaceService.META_PARAM_OS, Platform.getOS());
requestMetaParameters.put(DefaultMarketplaceService.META_PARAM_WS, Platform.getWS());
requestMetaParameters.put(DefaultMarketplaceService.META_PARAM_NL, Platform.getNL());
diff --git a/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/service/DefaultMarketplaceService.java b/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/service/DefaultMarketplaceService.java
index e4c77c2..a784855 100644
--- a/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/service/DefaultMarketplaceService.java
+++ b/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/service/DefaultMarketplaceService.java
@@ -103,6 +103,13 @@
public static final String META_PARAM_CLIENT = "client"; //$NON-NLS-1$
/**
+ * parameter identifying client plugin version
+ *
+ * @see {@link #setRequestMetaParameters(Map)}
+ */
+ public static final String META_PARAM_CLIENT_VERSION = "client.version"; //$NON-NLS-1$
+
+ /**
* parameter identifying windowing system as reported by {@link org.eclipse.core.runtime.Platform#getWS()}
*
* @see {@link #setRequestMetaParameters(Map)}
