diff options
author | sboshev | 2009-05-13 15:22:39 +0000 |
---|---|---|
committer | sboshev | 2009-05-13 15:22:39 +0000 |
commit | 93cad0d7808751dc3a2fc0f89edb5dd67894b90c (patch) | |
tree | 0a2cdf857747adc86fd22e88052629d7ab292ee2 | |
parent | 568231e2d6a9fcbc38ea9d7593fc10cf7c7ebe3b (diff) | |
download | rt.equinox.bundles-93cad0d7808751dc3a2fc0f89edb5dd67894b90c.tar.gz rt.equinox.bundles-93cad0d7808751dc3a2fc0f89edb5dd67894b90c.tar.xz rt.equinox.bundles-93cad0d7808751dc3a2fc0f89edb5dd67894b90c.zip |
Bug 275997. [ds] Declarative services fails to honor configuration policy
-rw-r--r-- | bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/model/ServiceComponent.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/model/ServiceComponent.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/model/ServiceComponent.java index 93b5713f2..8169bc633 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/model/ServiceComponent.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/model/ServiceComponent.java @@ -9,6 +9,7 @@ * Contributors: * ProSyst Software GmbH - initial API and implementation * Simon Archer - bug.id = 225624 + * Bryan Hunt - bug.id = 275997 *******************************************************************************/ package org.eclipse.equinox.internal.ds.model; @@ -675,8 +676,14 @@ public class ServiceComponent implements Externalizable { namespace11 = in.readBoolean(); if (namespace11) { flag = in.readBoolean(); - if (flag) + if (flag) { configurationPolicy = in.readUTF(); + if (configurationPolicy.equals(CONF_POLICY_IGNORE)) { + configurationPolicy = CONF_POLICY_IGNORE; + } else { + configurationPolicy = CONF_POLICY_REQUIRE; + } + } flag = in.readBoolean(); if (flag) activateMethodName = in.readUTF(); |