From 571769019ec19cc79192d522f580175670e44530 Mon Sep 17 00:00:00 2001
From: endolf <endolf@java.net>
Date: Sat, 28 Mar 2009 16:22:05 +0000
Subject: [PATCH] Check the arch type before loading the .so

---
 .../games/input/LinuxEnvironmentPlugin.java     | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/plugins/linux/src/java/net/java/games/input/LinuxEnvironmentPlugin.java b/plugins/linux/src/java/net/java/games/input/LinuxEnvironmentPlugin.java
index b8e9ef6..1f11a3c 100644
--- a/plugins/linux/src/java/net/java/games/input/LinuxEnvironmentPlugin.java
+++ b/plugins/linux/src/java/net/java/games/input/LinuxEnvironmentPlugin.java
@@ -89,17 +89,16 @@ public final class LinuxEnvironmentPlugin extends ControllerEnvironment implemen
 		String osName = getPrivilegedProperty("os.name", "").trim();
 		if(osName.equals("Linux")) {
 			try {
-				loadLibrary(LIBNAME);
+				if("i386".equals(getPrivilegedProperty("os.arch"))) {
+					loadLibrary(LIBNAME);
+				} else {
+					loadLibrary(LIBNAME + POSTFIX64BIT);
+				}
 	            supported = true;
 			} catch (UnsatisfiedLinkError e) {
-				try {
-					loadLibrary(LIBNAME + POSTFIX64BIT);
-		            supported = true;
-				} catch (UnsatisfiedLinkError e2) {
-					logln("Failed to load 64 bit library: " + e2.getMessage());
-					e.printStackTrace();
-					supported = false;
-				}
+				logln("Failed to load 64 bit library: " + e.getMessage());
+				e.printStackTrace();
+				supported = false;
 			}
 		}
 	}