Attachment 136087 Details for Bug 276564 – patch for loading with JDK7

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

[patch] patch for loading with JDK7

clipboard.txt (text/plain), 1.30 KB, created by David Green

on 2009-05-15 18:01:15 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: David Green

Created: 2009-05-15 18:01:15 EDT

Size: 1.30 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.swt
>Index: Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java,v
>retrieving revision 1.362
>diff -u -r1.362 Library.java
>--- Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java	8 May 2009 20:08:19 -0000	1.362
>+++ Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java	15 May 2009 22:01:32 -0000
>@@ -242,6 +242,16 @@
> 	if (path != null) {
> 		if (extract (path + SEPARATOR + fileName1, mappedName1)) return;
> 		if (mapName && extract (path + SEPARATOR + fileName2, mappedName2)) return;
>+		
>+		// bug 276564: JDK 7 (OpenJDK) attempt to load jnilib if names were mapped to dylib
>+		if (path != null && mappedName1.endsWith(".dylib")) {
>+			mappedName1 = mappedName1.substring(0,mappedName1.lastIndexOf(".dylib")) + ".jnilib";
>+			if (extract (path + SEPARATOR + fileName1, mappedName1)) return;
>+		}
>+		if (path != null && mappedName2.endsWith(".dylib")) {
>+			mappedName1 = mappedName2.substring(0,mappedName2.lastIndexOf(".dylib")) + ".jnilib";
>+			if (mapName && extract (path + SEPARATOR + fileName2, mappedName2)) return;
>+		}
> 	}
> 	
> 	/* Failed to find the library */

Actions: View | Diff

Attachments on bug 276564: 136087 | 136088 | 136339 | 136677 | 137195