| commit | aab021a1db7964b0b25368a0fb0ec3efb05b426e | [log] [tgz] |
|---|---|---|
| author | DJ Houghton <dj> | Fri Mar 28 20:11:45 2008 +0000 |
| committer | DJ Houghton <dj> | Fri Mar 28 20:11:45 2008 +0000 |
| tree | 853f44c6420ee70a49f79c88c40563db8a9e2a9d | |
| parent | 18dbdf16cfc514c95f58e13f2451c1cf2591eb8a [diff] |
Bug 224667 - Second dropin is not discovered
diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java index 4cc675f..8e5b53e 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java +++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java
@@ -3,6 +3,7 @@ import java.io.File; import java.net.MalformedURLException; import java.net.URL; +import java.util.Map; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.reconciler.dropins.Activator; import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; @@ -113,4 +114,14 @@ return plugins.isDirectory() || features.isDirectory(); } + + /* (non-Javadoc) + * @see org.eclipse.equinox.internal.provisional.spi.p2.core.repository.AbstractRepository#getProperties() + */ + public Map getProperties() { + if (metadataRepository == null) + return super.getProperties(); + else + return metadataRepository.getProperties(); + } }
diff --git a/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java b/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java index 4cc675f..8e5b53e 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java +++ b/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationMetadataRepository.java
@@ -3,6 +3,7 @@ import java.io.File; import java.net.MalformedURLException; import java.net.URL; +import java.util.Map; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.reconciler.dropins.Activator; import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; @@ -113,4 +114,14 @@ return plugins.isDirectory() || features.isDirectory(); } + + /* (non-Javadoc) + * @see org.eclipse.equinox.internal.provisional.spi.p2.core.repository.AbstractRepository#getProperties() + */ + public Map getProperties() { + if (metadataRepository == null) + return super.getProperties(); + else + return metadataRepository.getProperties(); + } }