Created
March 28, 2011 03:00
-
-
Save calavera/889939 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| From 917811e6b495cdd11a2e94ffa8bc6474c0ec56b1 Mon Sep 17 00:00:00 2001 | |
| From: David Calavera <[email protected]> | |
| Date: Sun, 27 Mar 2011 19:50:49 -0700 | |
| Subject: [PATCH] don't use the shared runtime. It's not properly configured nor useful | |
| --- | |
| .../jruby/rack/DefaultRackApplicationFactory.java | 7 +------ | |
| 1 files changed, 1 insertions(+), 6 deletions(-) | |
| diff --git a/src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java b/src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java | |
| index 5567cac..45feb68 100644 | |
| --- a/src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java | |
| +++ b/src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java | |
| @@ -202,12 +202,7 @@ public class DefaultRackApplicationFactory implements RackApplicationFactory { | |
| } | |
| private Ruby getRuntimeFrom(ScriptingContainer container) { | |
| - Ruby runtime = (Ruby) rackContext.getAttribute("jruby.runtime"); | |
| - if (runtime == null) { | |
| - return container.getProvider().getRuntime(); | |
| - } else { | |
| - return runtime; | |
| - } | |
| + return container.getProvider().getRuntime(); | |
| } | |
| private RackApplication createApplication(final ApplicationObjectFactory appfact) | |
| -- | |
| 1.7.4.1 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment