Suppress properly.

jruby · Sep 30, 2016 · 5d057d2 · 5d057d2
1 parent 2157f1e
commit 5d057d2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/core/src/main/java/org/jruby/ext/ffi/jffi/DefaultMethodFactory.java b/core/src/main/java/org/jruby/ext/ffi/jffi/DefaultMethodFactory.java
@@ -171,7 +171,7 @@ static ParameterMarshaller getMarshaller(Type type, CallingConvention convention
         }
     }
 
-    @SuppressWarnings("deprecated")
+    @SuppressWarnings("deprecation")
     private static ParameterMarshaller newConvertingMarshallerWithHash(Type type, CallingConvention convention, IRubyObject enums, MappedType ctype) {
         return new ConvertingMarshaller(
             getMarshaller(ctype.getRealType(), convention, enums.isNil() ? null : (RubyHash)enums),

diff --git a/core/src/main/java/org/jruby/ext/ffi/jffi/JITNativeInvoker.java b/core/src/main/java/org/jruby/ext/ffi/jffi/JITNativeInvoker.java
@@ -78,7 +78,7 @@ public JITNativeInvoker(RubyModule implementationClass, com.kenai.jffi.Function
         parameterCallSite6 = getParameterCallSite(signature, 6);
     }
 
-    @SuppressWarnings("deprecated")
+    @SuppressWarnings("deprecation")
     private static NativeDataConverter getParameterConverter(Signature signature, int i) {
         return signature.getParameterCount() > i
             ? DataConverters.getParameterConverter(signature.getParameterType(i), signature.getEnums()) : null;

diff --git a/core/src/main/java/org/jruby/javasupport/JavaSupportImpl.java b/core/src/main/java/org/jruby/javasupport/JavaSupportImpl.java
@@ -47,6 +47,7 @@
 import org.jruby.RubyModule;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.exceptions.Unrescuable;
+import org.jruby.runtime.Helpers;
 import org.jruby.util.ArraySupport;
 import org.jruby.util.Loader;
 import org.jruby.util.collections.ClassValue;
@@ -216,11 +217,8 @@ public void handleNativeException(Throwable exception, Member target) {
                 throw (RuntimeException) exception;
             }
         }
-        throw createRaiseException(exception, target);
-    }
-
-    private RaiseException createRaiseException(Throwable exception, Member target) {
-        return RaiseException.createNativeRaiseException(runtime, exception, target);
+        // rethrow original
+        Helpers.throwException(exception);
     }
 
     public ObjectProxyCache<IRubyObject,RubyClass> getObjectProxyCache() {