From 01461f8f22e2f39543b0cf091dfdc80b4a9baead Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Wed, 30 Oct 2024 11:18:42 -0500 Subject: [PATCH 1/2] Increment supplement version for the release --- bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF index 0b222098fda..268a9c23342 100644 --- a/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.supplement -Bundle-Version: 1.11.0.qualifier +Bundle-Version: 1.11.100.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.equinox.log;version="1.1", From 853336c99f5e3a9912ee790a0949c58b5414b6e5 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Wed, 30 Oct 2024 10:07:22 -0500 Subject: [PATCH 2/2] Set the original cause of the IOException for the tryLock call --- .../org/eclipse/osgi/internal/location/Locker_JavaNio.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaNio.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaNio.java index 9ce70d018e4..c0746391f98 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaNio.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaNio.java @@ -15,7 +15,10 @@ *******************************************************************************/ package org.eclipse.osgi.internal.location; -import java.io.*; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.RandomAccessFile; import java.nio.channels.FileLock; import java.nio.channels.OverlappingFileLockException; import org.eclipse.osgi.internal.messages.Msg; @@ -50,7 +53,7 @@ public synchronized boolean lock() throws IOException { System.out.println(NLS.bind(Msg.location_cannotLock, lockFile)); // produce a more specific message for clients String specificMessage = NLS.bind(Msg.location_cannotLockNIO, new Object[] {lockFile, ioe.getMessage(), "\"-D" + LocationHelper.PROP_OSGI_LOCKING + "=none\""}); //$NON-NLS-1$ //$NON-NLS-2$ - throw new IOException(specificMessage); + throw new IOException(specificMessage, ioe); } catch (OverlappingFileLockException e) { // handle it as null result fileLock = null;