From ddb49f4f90a33ba939c08de708eef3e5c11b4c55 Mon Sep 17 00:00:00 2001
From: Colin Surprenant <colin.surprenant@gmail.com>
Date: Sun, 2 Mar 2014 19:43:10 -0500
Subject: [PATCH] renamed JRubyProxyFunction to JRubyTridentFunction

---
 lib/red_storm/topology_launcher.rb            |  1 +
 ...unction.java => JRubyTridentFunction.java} | 21 ++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)
 rename src/main/redstorm/storm/jruby/{JRubyProxyFunction.java => JRubyTridentFunction.java} (73%)

diff --git a/lib/red_storm/topology_launcher.rb b/lib/red_storm/topology_launcher.rb
index e6c3139..eeaa8b3 100644
--- a/lib/red_storm/topology_launcher.rb
+++ b/lib/red_storm/topology_launcher.rb
@@ -31,6 +31,7 @@ java_import 'backtype.storm.tuple.Values'
 # java_import 'redstorm.storm.jruby.JRubyTransactionalSpout'
 # java_import 'redstorm.storm.jruby.JRubyTransactionalBolt'
 # java_import 'redstorm.storm.jruby.JRubyTransactionalCommitterBolt'
+# java_import 'redstorm.storm.jruby.JRubyProxyFunction'
 
 java_package 'redstorm'
 
diff --git a/src/main/redstorm/storm/jruby/JRubyProxyFunction.java b/src/main/redstorm/storm/jruby/JRubyTridentFunction.java
similarity index 73%
rename from src/main/redstorm/storm/jruby/JRubyProxyFunction.java
rename to src/main/redstorm/storm/jruby/JRubyTridentFunction.java
index 65c3041..9c277f2 100644
--- a/src/main/redstorm/storm/jruby/JRubyProxyFunction.java
+++ b/src/main/redstorm/storm/jruby/JRubyTridentFunction.java
@@ -14,45 +14,42 @@ import org.jruby.javasupport.JavaUtil;
 import org.jruby.RubyModule;
 import org.jruby.exceptions.RaiseException;
 
-public class JRubyProxyFunction implements Function {
+public class JRubyTridentFunction implements Function {
   private final String _realClassName;
   private final String _bootstrap;
 
   // transient to avoid serialization
-  private transient IRubyObject _proxy;
+  private transient IRubyObject _ruby_function;
   private transient Ruby __ruby__;
 
-  public JRubyProxyFunction(final String baseClassPath, final String realClassName) {
+  public JRubyTridentFunction(final String baseClassPath, final String realClassName) {
     _realClassName = realClassName;
     _bootstrap = "require '" + baseClassPath + "'";
   }
 
   @Override
   public void execute(final TridentTuple tuple, final TridentCollector collector) {
-    if(_proxy == null) {
-      _proxy = initialize_proxy();
-    }
     IRubyObject ruby_tuple = JavaUtil.convertJavaToRuby(__ruby__, tuple);
     IRubyObject ruby_collector = JavaUtil.convertJavaToRuby(__ruby__, collector);
-    Helpers.invoke(__ruby__.getCurrentContext(), _proxy, "execute", ruby_tuple, ruby_collector);
+    Helpers.invoke(__ruby__.getCurrentContext(), _ruby_function, "execute", ruby_tuple, ruby_collector);
   }
 
   @Override
   public void cleanup() {
-    Helpers.invoke(__ruby__.getCurrentContext(), _proxy, "cleanup");
+    Helpers.invoke(__ruby__.getCurrentContext(), _ruby_function, "cleanup");
   }
 
   @Override
   public void prepare(final Map conf, final TridentOperationContext context) {
-    if(_proxy == null) {
-      _proxy = initialize_proxy();
+    if(_ruby_function == null) {
+      _ruby_function = initialize_ruby_function();
     }
     IRubyObject ruby_conf = JavaUtil.convertJavaToRuby(__ruby__, conf);
     IRubyObject ruby_context = JavaUtil.convertJavaToRuby(__ruby__, context);
-    Helpers.invoke(__ruby__.getCurrentContext(), _proxy, "prepare", ruby_conf, ruby_context);
+    Helpers.invoke(__ruby__.getCurrentContext(), _ruby_function, "prepare", ruby_conf, ruby_context);
   }
 
-  private IRubyObject initialize_proxy() {
+  private IRubyObject initialize_ruby_function() {
     __ruby__ = Ruby.getGlobalRuntime();
 
     RubyModule ruby_class;