Adjusted the "deferred initialization" behavior so that the embedded scripting engine is not constructed until the first evaluation. This was done because embedded scripting engine initialization got noticeably slower in JRuby 1.6.

adamjmurray · adamjmurray · commit a7be724577f4 · 2011-06-06T17:18:58.000-07:00
diff --git a/src/jruby4max/rubysupport/MaxRubyAdapter.java b/src/jruby4max/rubysupport/MaxRubyAdapter.java
@@ -76,7 +76,6 @@ public MaxRubyAdapter( MaxObject maxObject, String context, String id, CompatVer
 		this.maxContext = context;
 		this.id = id;
 		this.rubyVersion = rubyVersion;
-		getEvaluator();
 	}
 
 	private void getEvaluator() {
@@ -135,7 +134,7 @@ public Object eval( CharSequence rubyCode ) {
 	 * @return an Atom or Atom[], it's up to the calling code to check the type
 	 */
 	public Object eval( CharSequence rubyCode, boolean returnResult ) {
-		if( !ruby.isInitialized() ) {
+		if( ruby == null || !ruby.isInitialized() ) {
 			init();
 		}
 		Object result;
@@ -158,6 +157,9 @@ public void init() {
 	}
 
 	public void init( File file, Atom[] args ) {
+		if (ruby == null) {
+			getEvaluator();
+		}
 		if( code.isEmpty() ) {
 			// setup the $LOAD_PATH
 			for( String loadPath : RubyProperties.getLoadPaths() ) {
