fixed at_exit

andrewcsmith · Aug 27, 2010 · f2a25d5 · f2a25d5
1 parent 94ce4b5
commit f2a25d5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/ajm/rubysupport/JRubyEmbedEvaluator.java b/src/ajm/rubysupport/JRubyEmbedEvaluator.java
@@ -42,7 +42,8 @@ public Object eval(CharSequence rubyCode) {
   }
 
   public void exit() {
-    // TODO
+  	container.terminate();
     container = null;
+
   }
 }
diff --git a/src/ajm/rubysupport/MaxRubyAdapter.java b/src/ajm/rubysupport/MaxRubyAdapter.java
@@ -365,7 +365,9 @@ private void buildArrayString(Object o, StringBuilder s) {
 		}
 	}
 
+	/*
 	public void on_context_destroyed(Object callback) {
 		ScriptEvaluatorManager.registerContextDestroyedListener(maxObject, callback.toString());
 	}
+	*/
 }
diff --git a/src/ajm/rubysupport/ScriptEvaluatorManager.java b/src/ajm/rubysupport/ScriptEvaluatorManager.java
@@ -47,7 +47,7 @@ public class ScriptEvaluatorManager {
 
 	private static Map<String, ScriptEvaluator> evaluatorContexts = new HashMap<String, ScriptEvaluator>();
 	private static Map<String, Integer> evaluatorContextCounter = new HashMap<String, Integer>();
-	private static MappedSet<String, String> evaluatorContextDestroyedListeners = new MappedSet<String, String>();
+	//private static MappedSet<String, String> evaluatorContextDestroyedListeners = new MappedSet<String, String>();
 	private static MappedSet<String, Object> objectsUsingEvaluator = new MappedSet<String, Object>();
 	private static Map<String, Map<String, Object>> maxObjectMap = new HashMap<String, Map<String, Object>>();
 	private static Constructor<ScriptEvaluator> evaluatorConstructor;
@@ -179,6 +179,7 @@ private static String getEvaluatorContext(String maxContext, Object maxObject) {
 		}
 	}
 
+	/*
 	public static void registerContextDestroyedListener(Object maxObject, String callbackMethod) {
 		String[] contextAndId = objectMetadata.get(maxObject);
 		if (contextAndId != null) {
@@ -187,10 +188,12 @@ public static void registerContextDestroyedListener(Object maxObject, String cal
 			evaluatorContextDestroyedListeners.addValue(evaluatorContext, callbackMethod);
 		}
 	}
+	*/
 
 	public static void notifyContextDestroyedListener(String maxContext, Object maxObject) {
 		String evaluatorContext = getEvaluatorContext(maxContext, maxObject);
 		ScriptEvaluator ruby = evaluatorContexts.get(evaluatorContext);
+		/*
 		Collection<String> callbackMethods = evaluatorContextDestroyedListeners.remove(evaluatorContext);
 		if (ruby != null && callbackMethods != null) {
 			for (String callbackMethod : callbackMethods) {
@@ -203,6 +206,7 @@ public static void notifyContextDestroyedListener(String maxContext, Object maxO
 				}
 			}
 		}
+		*/
 		if (ruby != null) {
 			// The callback method behavior above should be phased out in favor of this:
 			ruby.exit();