Attachment 154684 Details for Bug 298047 – updated alternative

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

updated alternative

298047.txt (text/plain), 2.05 KB, created by Andrew Niefer

on 2009-12-17 13:32:52 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Niefer

Created: 2009-12-17 13:32:52 EST

Size: 2.05 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.artifact.repository
>Index: src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java,v
>retrieving revision 1.82.2.11
>diff -u -r1.82.2.11 SimpleArtifactRepository.java
>--- src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java	16 Dec 2009 07:02:58 -0000	1.82.2.11
>+++ src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java	17 Dec 2009 18:35:46 -0000
>@@ -395,7 +395,8 @@
> 	}
> 
> 	public synchronized boolean contains(IArtifactDescriptor descriptor) {
>-		return artifactDescriptors.contains(descriptor);
>+		SimpleArtifactDescriptor simpleDescriptor = createInternalDescriptor(descriptor);
>+		return artifactDescriptors.contains(simpleDescriptor);
> 	}
> 
> 	public synchronized boolean contains(IArtifactKey key) {
>#P org.eclipse.equinox.p2.repository
>Index: src/org/eclipse/equinox/p2/repository/artifact/spi/ArtifactDescriptor.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/artifact/spi/Attic/ArtifactDescriptor.java,v
>retrieving revision 1.1.2.3
>diff -u -r1.1.2.3 ArtifactDescriptor.java
>--- src/org/eclipse/equinox/p2/repository/artifact/spi/ArtifactDescriptor.java	30 Nov 2009 19:25:28 -0000	1.1.2.3
>+++ src/org/eclipse/equinox/p2/repository/artifact/spi/ArtifactDescriptor.java	17 Dec 2009 18:35:46 -0000
>@@ -95,7 +95,7 @@
> 			return false;
> 
> 		// Other implementations of IArtifactDescriptor must not be considered equal
>-		if (!(obj instanceof ArtifactDescriptor))
>+		if (!(obj.getClass().equals(getClass())))
> 			return false;
> 
> 		ArtifactDescriptor other = (ArtifactDescriptor) obj;

Actions: View

Attachments on bug 298047: 154641 | 154681 | 154684