Got JRuby parser compiling. Still not parsing request...

.gitignore

@@ -8,8 +8,10 @@ ext/thin_parser/*.obj
 ext/thin_parser/*mswin32*
 ext/thin_parser/vc60.pdb
 ext/thin_parser/*.so
+ext/thin_parser_jruby/classes
 lib/*.bundle
 lib/*.so
+lib/*.jar
 log
 spec/rails_app/log
 doc/rdoc/*

Rakefile

@@ -12,7 +12,7 @@ Dir['tasks/**/*.rake'].each { |rake| load rake }
 task :default => :spec
 
 if JRUBY
-  jruby_ext_task :thin_parser_jruby
+  jruby_ext_task :thin_parser_jruby, "lib/thin_parser.jar"
 else
   ext_task :thin_parser
 end

ext/thin_parser_jruby/ThinParserService.java

@@ -3,11 +3,11 @@
 import org.jruby.Ruby;
 import org.jruby.runtime.load.BasicLibraryService;
 
-import org.thin.HttpParser;
+import org.thin.Http;
 
 public class ThinParserService implements BasicLibraryService { 
     public boolean basicLoad(final Ruby runtime) throws IOException {
-        HttpParser.createHttp(runtime);
+        Http.createHttp(runtime);
         return true;
     }
 }

ext/thin_parser_jruby/org/thin/HttpParser.java

@@ -248,7 +248,7 @@ public void init() {
       }
    }
 
-   public final HttpParser parser = new HttpParserMachine();
+   public final HttpParserMachine parser = new HttpParserMachine();
 
    public int execute(ByteList buffer, int off) {
      int p, pe;
@@ -456,7 +456,6 @@ else if ( data[p] > _http_parser_trans_keys[_mid+1] )
 
      if(parser.body_start>0) {
         /* final \r\n combo encountered so stop right here */
-        parser.eof = p;
         parser.nread++;
      }
 
@@ -466,8 +465,6 @@ else if ( data[p] > _http_parser_trans_keys[_mid+1] )
    public int finish() {
      int cs = parser.cs;
 
-     parser.eof = p;
-
      parser.cs = cs;
 
     if(has_error()) {

ext/thin_parser_jruby/parser.java.rl

@@ -79,7 +79,7 @@ public class HttpParser {
      public void call(Object data, int field, int flen, int value, int vlen);
    }
 
-   public static class HttpParser {
+   public static class HttpParserMachine {
       int cs;
       int body_start;
       int content_len;
@@ -115,7 +115,7 @@ public class HttpParser {
       }
    }
 
-   public final HttpParser parser = new HttpParser();
+   public final HttpParserMachine parser = new HttpParserMachine();
 
    public int execute(ByteList buffer, int off) {
      int p, pe;
@@ -142,7 +142,6 @@ public class HttpParser {
 
      if(parser.body_start>0) {
         /* final \r\n combo encountered so stop right here */
-        parser.eof = p;
         parser.nread++;
      }
 
@@ -152,8 +151,6 @@ public class HttpParser {
    public int finish() {
      int cs = parser.cs;
 
-     parser.eof = p;
-
      parser.cs = cs;
 
     if(has_error()) {

lib/thin/version.rb

@@ -29,4 +29,8 @@ def self.linux?
   def self.ruby_18?
     RUBY_VERSION =~ /^1\.8/
   end
+
+  def self.jruby?
+    RUBY_PLATFORM =~ /java/
+  end
 end

tasks/ext.rake

@@ -27,10 +27,9 @@ def ext_task(name)
   end
 end
 
-def jruby_ext_task(name)
+def jruby_ext_task(name, jar_file)
   ext_dir   = "ext/#{name}"
   build_dir = "ext/#{name}/classes"
-  jar_file  = "lib/#{name}.jar"
 
   # Avoid JRuby in-process launching problem
   require 'jruby'