Merge branch 'fishwife-dev' (Fix toString for jruby-1.7.0) into fishwife

dekellum · Oct 22, 2012 · 70b4d72 · 70b4d72
2 parents 404e8e8 + 278e1bb
commit 70b4d72
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/fishwife/rack_servlet.rb b/lib/fishwife/rack_servlet.rb
@@ -132,7 +132,7 @@ def servlet_to_rack(request)
       env['SCRIPT_NAME'] = ""
 
       # Rack says URI, but it hands off a URL.
-      req_uri = request.getRequestURL.toString
+      req_uri = request.getRequestURL.to_s
 
       # Java chops off the query string, but a Rack application will
       # expect it, so we'll add it back if present