Merge branch 'master' into additional-vmargs-locations

eclipse-equinox · Nov 7, 2024 · 6962fda · 6962fda
2 parents 7e684f2 + 2815608
commit 6962fda
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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",

diff --git a/...es/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaNio.java b/...es/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;