Attachment 108765 Details for Bug 242465 – possible patch

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

[patch] possible patch

clipboard.txt (text/plain), 1.78 KB, created by Brian Fitzpatrick

on 2008-07-30 13:25:49 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Fitzpatrick

Created: 2008-07-30 13:25:49 EDT

Size: 1.78 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.datatools.connectivity
>Index: src/org/eclipse/datatools/connectivity/drivers/DriverManager.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity/src/org/eclipse/datatools/connectivity/drivers/DriverManager.java,v
>retrieving revision 1.24
>diff -u -r1.24 DriverManager.java
>--- src/org/eclipse/datatools/connectivity/drivers/DriverManager.java	24 Jul 2008 20:44:42 -0000	1.24
>+++ src/org/eclipse/datatools/connectivity/drivers/DriverManager.java	30 Jul 2008 17:24:12 -0000
>@@ -858,7 +858,29 @@
> 
> 				if (Platform.getBundle(pluginId) != null) {
> 					String entry = File.separator + restOfPath + File.separator;
>-					URL url = Platform.getBundle(pluginId).getEntry(entry);
>+					URL url = null;
>+					if (restOfPath == null || restOfPath.trim().length() == 0) {
>+						try {
>+							String path2 = FileLocator.resolve(Platform.getBundle(pluginId).getEntry("/")).getPath();//$NON-NLS-1$
>+							if (path2.endsWith("!/"))//$NON-NLS-1$
>+								path2 = path2.substring(0, path2.length() - 2);
>+							url = new URL(path2);
>+						} catch (IOException e) {
>+							String[] strs = new String[] { pluginId
>+									+ restOfPath};
>+							System.err.println(DriverMgmtMessages.format(
>+									"DriverMgmtPlugin.FileMissing", strs)); //$NON-NLS-1$
>+							ConnectivityPlugin
>+									.getDefault()
>+									.log(
>+											DriverMgmtMessages
>+													.format(
>+															"DriverMgmtPlugin.FileMissing", strs)); //$NON-NLS-1$
>+						}
>+					}
>+					else {
>+						url = Platform.getBundle(pluginId).getEntry(entry);
>+					}
> 					if (url != null) {
> 						try {
> 							url = FileLocator.toFileURL(url);

Actions: View | Diff

Attachments on bug 242465: 108765