Browse Source

Require JRuby 1.6+ (avoiding the use of deprecated API)

pull/263/head
Juergen Hoeller 12 years ago
parent
commit
90f79f3f4f
  1. 5
      spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java

5
spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2013 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.
@ -80,8 +80,7 @@ public abstract class JRubyScriptUtils {
Ruby ruby = initializeRuntime(); Ruby ruby = initializeRuntime();
Node scriptRootNode = ruby.parseEval(scriptSource, "", null, 0); Node scriptRootNode = ruby.parseEval(scriptSource, "", null, 0);
// keep using the deprecated runNormally variant for JRuby 1.1/1.2 compatibility... IRubyObject rubyObject = ruby.runNormally(scriptRootNode);
IRubyObject rubyObject = ruby.runNormally(scriptRootNode, false);
if (rubyObject instanceof RubyNil) { if (rubyObject instanceof RubyNil) {
String className = findClassName(scriptRootNode); String className = findClassName(scriptRootNode);

Loading…
Cancel
Save