Attachment 161027 Details for Bug 256434 – patch

[patch] patch

256434.txt (text/plain), 2.47 KB, created by Andrew Niefer

on 2010-03-04 15:40:37 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Niefer

Created: 2010-03-04 15:40:37 EST

Size: 2.47 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.89
>diff -u -r1.89 SimpleArtifactRepository.java
>--- src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java	26 Feb 2010 16:05:04 -0000	1.89
>+++ src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java	4 Mar 2010 20:32:21 -0000
>@@ -43,7 +43,7 @@
> import org.eclipse.equinox.p2.repository.artifact.spi.ArtifactDescriptor;
> import org.eclipse.osgi.util.NLS;
> 
>-public class SimpleArtifactRepository extends AbstractArtifactRepository implements IArtifactRepository, IFileArtifactRepository, IIndexProvider<IArtifactKey> {
>+public class SimpleArtifactRepository extends AbstractArtifactRepository implements IFileArtifactRepository, IIndexProvider<IArtifactKey> {
> 	/** 
> 	 * A boolean property controlling whether mirroring is enabled.
> 	 */
>@@ -735,7 +735,7 @@
> 		// Determine writing location
> 		URI newLocation = createLocation(newDescriptor);
> 		if (newLocation == null)
>-			throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, "No location for " + newDescriptor));
>+			throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, NLS.bind(Messages.no_location, newDescriptor)));
> 		String file = URIUtil.toFile(newLocation).getAbsolutePath();
> 
> 		// TODO at this point we have to assume that the repository is file-based.  Eventually 
>@@ -992,11 +992,12 @@
> 	}
> 
> 	public IQueryable<IArtifactDescriptor> descriptorQueryable() {
>-		final Collection<List<IArtifactDescriptor>> descs = artifactMap.values();
> 		return new IQueryable<IArtifactDescriptor>() {
>-
> 			public IQueryResult<IArtifactDescriptor> query(IQuery<IArtifactDescriptor> query, IProgressMonitor monitor) {
>-				return query.perform(new CompoundIterator<IArtifactDescriptor>(descs.iterator()));
>+				synchronized (SimpleArtifactRepository.this) {
>+					Collection<List<IArtifactDescriptor>> descs = SimpleArtifactRepository.this.artifactMap.values();
>+					return query.perform(new CompoundIterator<IArtifactDescriptor>(descs.iterator()));
>+				}
> 			}
> 		};
> 	}

Actions: View | Diff

Attachments on bug 256434: 151357 | 161027