Attachment #281505 for bug #376975

View | Details | Raw Unified | Return to bug 376975
Collapse All | Expand All




		final String libraryNameWithPrefixAndArchAndSuffix = libraryNameWithPrefixAndArch + prefix;
		String resourceName = path + libraryNameWithPrefixAndArchAndSuffix;

		try {
		if (nativeLib.exists()) {
			System.out.println("Attempting to load the NativeThread library ["+libraryName+']');
			System.loadLibrary(libraryName);
			success = true;
		} catch(UnsatisfiedLinkError ule) {
			try {
				// Get the resource
				URL resource = LibraryLoader.class.getResource(resourceName);

Return to bug 376975

Lines 48-59 Link Here

(-)freenet-0.7.5_p1384/src/freenet/support/LibraryLoader.java.orig (-3 / +2 lines)
48	final String libraryNameWithPrefixAndArchAndSuffix = libraryNameWithPrefixAndArch + prefix;	48	final String libraryNameWithPrefixAndArchAndSuffix = libraryNameWithPrefixAndArch + prefix;
49	String resourceName = path + libraryNameWithPrefixAndArchAndSuffix;	49	String resourceName = path + libraryNameWithPrefixAndArchAndSuffix;
50		50
51	File nativeLib = new File((System.getProperty("java.library.path")) + "/lib" + libraryName + prefix);	51	try {
52	if (nativeLib.exists()) {
53	System.out.println("Attempting to load the NativeThread library ["+libraryName+']');	52	System.out.println("Attempting to load the NativeThread library ["+libraryName+']');
54	System.loadLibrary(libraryName);	53	System.loadLibrary(libraryName);
55	success = true;	54	success = true;
56	} else {	55	} catch(UnsatisfiedLinkError ule) {
57	try {	56	try {
58	// Get the resource	57	// Get the resource
59	URL resource = LibraryLoader.class.getResource(resourceName);	58	URL resource = LibraryLoader.class.getResource(resourceName);