Handle NCDFE for odd envs like GAE that throw it for Unsafe.

Fixes #2304.
jruby · Dec 12, 2014 · 0576fd5 · 0576fd5
1 parent 81879f1
commit 0576fd5
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/core/src/main/java/org/jruby/util/unsafe/UnsafeHolder.java b/core/src/main/java/org/jruby/util/unsafe/UnsafeHolder.java
@@ -50,6 +50,9 @@ private static sun.misc.Unsafe loadUnsafe() {
             return (sun.misc.Unsafe) f.get(null);
         } catch (Exception e) {
             return null;
+        } catch (NoClassDefFoundError ncdfe) {
+            // Google AppEngine raises NCDFE for Unsafe rather than CNFE
+            return null;
         }
     }