root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Adapt to JRuby 9.1.7+ RubyException.getMessage() method at runtime 

Issue: SPR-15322
This commit is contained in:
Juergen Hoeller 2017-03-07 10:33:34 +01:00
parent 9de97614a0
commit e58b17a3a1
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptFactory.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -17,6 +17,7 @@
package org.springframework.scripting.jruby; package org.springframework.scripting.jruby;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Method;
import org.jruby.RubyException; import org.jruby.RubyException;
import org.jruby.exceptions.JumpException; import org.jruby.exceptions.JumpException;
@ -28,6 +29,7 @@ import org.springframework.scripting.ScriptFactory;
import org.springframework.scripting.ScriptSource; import org.springframework.scripting.ScriptSource;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils;
/** /**
* {@link org.springframework.scripting.ScriptFactory} implementation * {@link org.springframework.scripting.ScriptFactory} implementation
@ -37,8 +39,8 @@ import org.springframework.util.ClassUtils;
* {@link org.springframework.scripting.support.ScriptFactoryPostProcessor}; * {@link org.springframework.scripting.support.ScriptFactoryPostProcessor};
* see the latter's javadoc for a configuration example. * see the latter's javadoc for a configuration example.
* *
* <p>Note: Spring 4.0 supports JRuby 1.5 and higher. * <p>Note: Spring 4.0 supports JRuby 1.5 and higher, with 1.7.x recommended.
* As of Spring 4.2, JRuby 9.0.0.0 is supported but only through * As of Spring 4.2, JRuby 9.0.0.0 is supported as well but primarily through
* {@link org.springframework.scripting.support.StandardScriptFactory}. * {@link org.springframework.scripting.support.StandardScriptFactory}.
* *
* @author Juergen Hoeller * @author Juergen Hoeller
@ -52,6 +54,9 @@ import org.springframework.util.ClassUtils;
@Deprecated @Deprecated
public class JRubyScriptFactory implements ScriptFactory, BeanClassLoaderAware { public class JRubyScriptFactory implements ScriptFactory, BeanClassLoaderAware {
private static final Method getMessageMethod = ClassUtils.getMethodIfAvailable(RubyException.class, "getMessage");
private final String scriptSourceLocator; private final String scriptSourceLocator;
private final Class<?>[] scriptInterfaces; private final Class<?>[] scriptInterfaces;
@ -110,10 +115,21 @@ public class JRubyScriptFactory implements ScriptFactory, BeanClassLoaderAware {
scriptSource.getScriptAsString(), actualInterfaces, this.beanClassLoader); scriptSource.getScriptAsString(), actualInterfaces, this.beanClassLoader);
} }
catch (RaiseException ex) { catch (RaiseException ex) {
String msg = null;
RubyException rubyEx = ex.getException(); RubyException rubyEx = ex.getException();
String msg = (rubyEx != null && rubyEx.message != null) ? if (rubyEx != null) {
rubyEx.message.toString() : "Unexpected JRuby error"; if (getMessageMethod != null) {
throw new ScriptCompilationException(scriptSource, msg, ex); // JRuby 9.1.7+ enforces access via getMessage() method
msg = ReflectionUtils.invokeMethod(getMessageMethod, rubyEx).toString();
}
else {
// JRuby 1.7.x: no accessor, just a public message field
if (rubyEx.message != null){
msg = rubyEx.message.toString();
}
}
}
throw new ScriptCompilationException(scriptSource, (msg != null ? msg : "Unexpected JRuby error"), ex);
} }
catch (JumpException ex) { catch (JumpException ex) {
throw new ScriptCompilationException(scriptSource, ex); throw new ScriptCompilationException(scriptSource, ex);

6
spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -44,8 +44,8 @@ import org.springframework.util.StringUtils;
/** /**
* Utility methods for handling JRuby-scripted objects. * Utility methods for handling JRuby-scripted objects.
* *
* <p>Note: Spring 4.0 supports JRuby 1.5 and higher. * <p>Note: Spring 4.0 supports JRuby 1.5 and higher, with 1.7.x recommended.
* As of Spring 4.2, JRuby 9.0.0.0 is supported but only through * As of Spring 4.2, JRuby 9.0.0.0 is supported as well but primarily through
* {@link org.springframework.scripting.support.StandardScriptFactory}. * {@link org.springframework.scripting.support.StandardScriptFactory}.
* *
* @author Rob Harrop * @author Rob Harrop