Bug 258166 - [composite repo] CompositeArtifactRepository.getOutputStream returns null

3 files changed, 17 insertions, 5 deletions

diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java
index 89394ab28..f3f0316d2 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java
@@ -126,40 +126,49 @@ public class CompositeArtifactRepository extends AbstractArtifactRepository impl
 	}
 
 	/**
-	 * Composite repositories should be unable to directly modify their sub repositories
+	 * Composite repositories should be unable to directly modify their child repositories
 	 */
 	public synchronized void addDescriptor(IArtifactDescriptor descriptor) {
 		throw new UnsupportedOperationException(Messages.exception_unsupportedAddToComposite);
 	}
 
 	/**
-	 * Composite repositories should be unable to directly modify their sub repositories
+	 * Composite repositories should be unable to directly modify their child repositories
 	 */
 	public void addDescriptors(IArtifactDescriptor[] descriptors) {
 		throw new UnsupportedOperationException(Messages.exception_unsupportedAddToComposite);
 	}
 
 	/**
-	 * Composite repositories should be unable to directly modify their sub repositories
+	 * Composite repositories should be unable to directly modify their child repositories
 	 */
 	public void removeDescriptor(IArtifactKey key) {
 		throw new UnsupportedOperationException(Messages.exception_unsupportedRemoveFromComposite);
 	}
 
 	/**
-	 * Composite repositories should be unable to directly modify their sub repositories
+	 * Composite repositories should be unable to directly modify their child repositories
 	 */
 	public void removeDescriptor(IArtifactDescriptor descriptor) {
 		throw new UnsupportedOperationException(Messages.exception_unsupportedRemoveFromComposite);
 	}
 
 	/**
-	 * Composite repositories should be unable to directly modify their sub repositories
+	 * Composite repositories should be unable to directly modify their child repositories
 	 */
 	public synchronized void removeAll() {
 		throw new UnsupportedOperationException(Messages.exception_unsupportedRemoveFromComposite);
 	}
 
+	/**
+	 * Composite repositories should be unable to directly modify their child repositories,
+	 * Composite repositories should not have their own content.
+	 * Therefore, they should not be allowed to have OutputStreams
+	 */
+	public OutputStream getOutputStream(IArtifactDescriptor descriptor) {
+		throw new UnsupportedOperationException(Messages.exception_unsupportedGetOutputStream);
+	}
+
 	public boolean contains(IArtifactKey key) {
 		boolean contains = false;
 		for (Iterator repositoryIterator = childrenURIs.iterator(); repositoryIterator.hasNext() && !contains;) {
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Messages.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Messages.java
index 313e6e089..4ecc8610f 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Messages.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Messages.java
@@ -46,6 +46,8 @@ public class Messages extends NLS {
 	public static String exception_needSourceDestination;
 	public static String exception_malformedRepoURI;
 	public static String exception_unsupportedAddToComposite;
+
+	public static String exception_unsupportedGetOutputStream;
 	public static String exception_unsupportedRemoveFromComposite;
 
 	public static String Mirroring_NO_MATCHING_DESCRIPTOR;
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/messages.properties b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/messages.properties
index b821b64de..24b2f90ef 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/messages.properties
@@ -48,4 +48,5 @@ exception_malformedRepoURI = The repository location ({0}) must be a URI.
 Mirroring_NO_MATCHING_DESCRIPTOR=Could not match descriptor for compare
 
 exception_unsupportedAddToComposite = Cannot add descriptors to a composite repository.
+exception_unsupportedGetOutputStream=Cannot write artifacts to a composite repository.
 exception_unsupportedRemoveFromComposite = Cannot remove descriptors from a composite repository.
\ No newline at end of file