Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 276564 | Differences between
and this patch

Collapse All | Expand All

(-)Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java (+10 lines)
Lines 242-247 Link Here
242 
	if (path != null) {
 242 
	if (path != null) {
243 
		if (extract (path + SEPARATOR + fileName1, mappedName1)) return;
 243 
		if (extract (path + SEPARATOR + fileName1, mappedName1)) return;
244 
		if (mapName && extract (path + SEPARATOR + fileName2, mappedName2)) return;
 244 
		if (mapName && extract (path + SEPARATOR + fileName2, mappedName2)) return;
245
246 
		// bug 276564: JDK 7 (OpenJDK) attempt to load jnilib if names were mapped to dylib
247 
		if (path != null && mappedName1.endsWith(".dylib")) {
248 
			mappedName1 = mappedName1.substring(0,mappedName1.lastIndexOf(".dylib")) + ".jnilib";
249 
			if (extract (path + SEPARATOR + fileName1, mappedName1)) return;
250 
		}
251 
		if (path != null && mappedName2.endsWith(".dylib")) {
252 
			mappedName1 = mappedName2.substring(0,mappedName2.lastIndexOf(".dylib")) + ".jnilib";
253 
			if (mapName && extract (path + SEPARATOR + fileName2, mappedName2)) return;
254 
		}
245 
	}
 255 
	}
246
256
247 
	/* Failed to find the library */
 257 
	/* Failed to find the library */

Return to bug 276564