NEW - bug 339178: IOException when we try to acquire a lock in a read only area
https://bugs.eclipse.org/bugs/show_bug.cgi?id=339178
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
index 23be4f4..01e408b 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
@@ -73,12 +73,12 @@
* Location of the repository lock
*/
private Location lockLocation = null;
-
+
/**
* Does this instance of the repository currently hold a lock
*/
private boolean holdsLock = false;
-
+
private long cacheTimestamp = 0l;
public class ArtifactOutputStream extends OutputStream implements IStateful {
@@ -321,7 +321,7 @@
boolean lockAcquired = false;
try {
- if (!holdsLock() && URIUtil.isFileURI(location)) {
+ if (canLock()) {
lockAcquired = lockAndLoad(true, new NullProgressMonitor());
if (!lockAcquired)
throw new IllegalStateException("Cannot acquire the lock for " + location); //$NON-NLS-1$
@@ -351,7 +351,7 @@
public synchronized void addDescriptor(IArtifactDescriptor toAdd, IProgressMonitor monitor) {
boolean lockAcquired = false;
try {
- if (!holdsLock() && URIUtil.isFileURI(getLocation())) {
+ if (canLock()) {
lockAcquired = lockAndLoad(false, monitor);
if (!lockAcquired)
return;
@@ -398,7 +398,7 @@
public synchronized void addDescriptors(IArtifactDescriptor[] descriptors, IProgressMonitor monitor) {
boolean lockAcquired = false;
try {
- if (!holdsLock() && URIUtil.isFileURI(getLocation())) {
+ if (canLock()) {
lockAcquired = lockAndLoad(false, monitor);
if (!lockAcquired)
return;
@@ -969,7 +969,7 @@
public synchronized void removeAll(IProgressMonitor monitor) {
boolean lockAcquired = false;
try {
- if (!holdsLock() && URIUtil.isFileURI(getLocation())) {
+ if (canLock()) {
lockAcquired = lockAndLoad(false, monitor);
if (!lockAcquired)
return;
@@ -990,7 +990,7 @@
public synchronized void removeDescriptor(IArtifactDescriptor descriptor, IProgressMonitor monitor) {
boolean lockAcquired = false;
try {
- if (!holdsLock() && URIUtil.isFileURI(getLocation())) {
+ if (canLock()) {
lockAcquired = lockAndLoad(false, monitor);
if (!lockAcquired)
return;
@@ -1007,7 +1007,7 @@
public synchronized void removeDescriptors(IArtifactDescriptor[] descriptors, IProgressMonitor monitor) {
boolean lockAcquired = false;
try {
- if (!holdsLock() && URIUtil.isFileURI(getLocation())) {
+ if (canLock()) {
lockAcquired = lockAndLoad(false, monitor);
if (!lockAcquired)
return;
@@ -1027,7 +1027,7 @@
public synchronized void removeDescriptors(IArtifactKey[] keys, IProgressMonitor monitor) {
boolean lockAcquired = false;
try {
- if (!holdsLock() && URIUtil.isFileURI(getLocation())) {
+ if (canLock()) {
lockAcquired = lockAndLoad(false, monitor);
if (!lockAcquired)
return;
@@ -1050,7 +1050,7 @@
public synchronized void removeDescriptor(IArtifactKey key, IProgressMonitor monitor) {
boolean lockAcquired = false;
try {
- if (!holdsLock() && URIUtil.isFileURI(getLocation())) {
+ if (canLock()) {
lockAcquired = lockAndLoad(false, monitor);
if (!lockAcquired)
return;
@@ -1182,7 +1182,7 @@
public String setProperty(String key, String newValue, IProgressMonitor monitor) {
boolean lockAcquired = false;
try {
- if (!holdsLock() && URIUtil.isFileURI(getLocation())) {
+ if (canLock()) {
lockAcquired = lockAndLoad(false, monitor);
if (!lockAcquired)
return super.getProperty(key);
@@ -1232,7 +1232,7 @@
boolean lockAcquired = false;
synchronized (this) {
try {
- if (!holdsLock() && URIUtil.isFileURI(getLocation())) {
+ if (canLock()) {
lockAcquired = lockAndLoad(false, monitor);
if (!lockAcquired)
return new Status(IStatus.ERROR, Activator.ID, "Could not lock artifact repository for writing", null); //$NON-NLS-1$
@@ -1322,6 +1322,20 @@
}
}
+ private synchronized boolean canLock() {
+ if (holdsLock())
+ return false;
+ if (!URIUtil.isFileURI(getLocation()))
+ return false;
+
+ try {
+ lockLocation = getLockLocation();
+ } catch (IOException e) {
+ return false;
+ }
+ return !lockLocation.isReadOnly();
+ }
+
/**
* Actually lock the location. This method should only be called
* from LockAndLoad. If you only want to lock the repository and not
@@ -1366,9 +1380,15 @@
if (this.lockLocation != null)
return this.lockLocation;
+ URI repositoryLocation = getLocation();
+ if (!URIUtil.isFileURI(repositoryLocation)) {
+ throw new IOException("Cannot lock a non file based repository"); //$NON-NLS-1$
+ }
+
// TODO: Throw an IO Exception if we cannot lock this location
Location anyLoc = (Location) ServiceHelper.getService(Activator.getContext(), Location.class.getName());
- Location location = anyLoc.createLocation(null, getLockFile().toURL(), false);
+ File repositoryFile = URIUtil.toFile(repositoryLocation);
+ Location location = anyLoc.createLocation(null, getLockFile().toURL(), !repositoryFile.canWrite());
location.set(getLockFile().toURL(), false);
return location;
}
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java
index 0008ad1..3ba5983 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java
@@ -88,20 +88,21 @@
IStatus result = null;
boolean lock = false;
try {
- if (URIUtil.isFileURI(location) && acquireLock)
+ if (canLock(location) && acquireLock) {
lock = lock(location, true, monitor);
- else
- lock = true; // No need to lock
- if (lock) {
+ if (lock) {
+ repositoryParser.parse(input);
+ result = repositoryParser.getStatus();
+ } else {
+ result = Status.CANCEL_STATUS;
+ }
+ } else {
repositoryParser.parse(input);
result = repositoryParser.getStatus();
- } else
- result = Status.CANCEL_STATUS;
+ }
} finally {
if (lock)
unlock(location);
- else
- result = Status.CANCEL_STATUS;
}
switch (result.getSeverity()) {
@@ -127,6 +128,18 @@
}
}
+ private synchronized boolean canLock(URI repositoryLocation) {
+ if (!URIUtil.isFileURI(repositoryLocation))
+ return false;
+
+ try {
+ lockLocation = getLockLocation(repositoryLocation);
+ } catch (IOException e) {
+ return false;
+ }
+ return !lockLocation.isReadOnly();
+ }
+
private synchronized boolean lock(URI repositoryLocation, boolean wait, IProgressMonitor monitor) throws IOException {
lockLocation = getLockLocation(repositoryLocation);
boolean locked = lockLocation.lock();
@@ -157,8 +170,12 @@
* Returns the location of the lock file.
*/
private Location getLockLocation(URI repositoryLocation) throws IOException {
+ if (!URIUtil.isFileURI(repositoryLocation)) {
+ throw new IOException("Cannot lock a non file based repository"); //$NON-NLS-1$
+ }
+ File repositoryFile = URIUtil.toFile(repositoryLocation);
Location anyLoc = (Location) ServiceHelper.getService(Activator.getContext(), Location.class.getName());
- Location location = anyLoc.createLocation(null, getLockFile(repositoryLocation).toURL(), false);
+ Location location = anyLoc.createLocation(null, getLockFile(repositoryLocation).toURL(), !repositoryFile.canWrite());
location.set(getLockFile(repositoryLocation).toURL(), false);
return location;
}
