Changeset 11750

Timestamp:

04/11/09 21:47:05 (14 years ago)

Author:

Mark Evenson

Message:

Don't die if if the Java system property 'os.arch' doesn't exist.

Google App Engine's JVM does not provide the "os.arch" system, but we
shouldn't be failing for this anyways 'cuz argubly the machine type is
Java. Still, this might be useful for determining JNI libraries to
load.

If 'os.arch' doesn't exist, use 'UNKNOWN' for machine-type.

Thanks to Vladimir V. Korablin for the patch.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Lisp.java (modified) (1 diff)
• machine_type.java (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Lisp.java

@@ -2215 +2215 @@
   {
     String os_arch = System.getProperty("os.arch");
-    if (os_arch.equals("amd64"))
-      Symbol.FEATURES.setSymbolValue(new Cons(Keyword.X86_64,
-                                              Symbol.FEATURES.getSymbolValue()));
-    else if (os_arch.equals("x86"))
-      Symbol.FEATURES.setSymbolValue(new Cons(Keyword.X86,
-                                              Symbol.FEATURES.getSymbolValue()));
+    if(os_arch != null) {
+      if (os_arch.equals("amd64"))
+        Symbol.FEATURES.setSymbolValue(new Cons(Keyword.X86_64,
+                                                Symbol.FEATURES.getSymbolValue()));
+      else if (os_arch.equals("x86"))
+        Symbol.FEATURES.setSymbolValue(new Cons(Keyword.X86,
+                                                Symbol.FEATURES.getSymbolValue()));
+    }
   }
 

trunk/abcl/src/org/armedbear/lisp/machine_type.java

@@ -46 +46 @@
   {
     String s = System.getProperty("os.arch");
-    if (s.equals("amd64"))
+    if (s == null)
+      s = "UNKNOWN";
+    else if (s.equals("amd64"))
       s = "X86-64";
     else