0
@@ -13,7 +13,7 @@ module Merb
0
     autoload :WEBrick,        "merb-core/rack/adapter/webrick"
0
     
0
     autoload :Deferral,         "merb-core/rack/apps/deferral"
0
-    autoload :MerbDispatch,    "merb-core/rack/apps/merb_dispatch"
0
+    autoload :MerbApplication,    "merb-core/rack/apps/merb_application"
0
     autoload :PathPrefix,      "merb-core/rack/apps/path_prefix"
0
     autoload :Static,          "merb-core/rack/apps/static"
0
   end # Rack

0
@@ -29,10 +29,12 @@ module Merb
0
       #   Options for creating a new application. Currently ignored.
0
       def initialize(options={})
0
         @app = ::Rack::Builder.new {
0
-           use Merb::Rack::PathPrefix, ::Merb::Config[:path_prefix]
0
+           if prefix = ::Merb::Config[:path_prefix]
0
+             use Merb::Rack::PathPrefix, prefix
0
+           end
0
            use Merb::Rack::Deferral 
0
            use Merb::Rack::Static, Merb.dir_for(:public)
0
-           run Merb::Rack::MerbDispatch.new
0
+           run Merb::Rack::MerbApplication.new
0
          }.to_app
0
       end      
0
     end

0
@@ -4,17 +4,16 @@ module Merb
0
 
0
       def initialize(app, path_prefix = nil)
0
         super(app)
0
-        if path_prefix
0
-          @path_prefix = /^#{Regexp.escape(path_prefix)}/
0
-        end
0
+        @path_prefix = /^#{Regexp.escape(path_prefix)}/
0
       end
0
       
0
       def deferred?(env)
0
-        strip_path_prefix(env) if @path_prefix 
0
+        strip_path_prefix(env) 
0
+        @app.deferred?(env)
0
       end
0
       
0
       def call(env)
0
-        strip_path_prefix(env) if @path_prefix 
0
+        strip_path_prefix(env) 
0
         @app.call(env)
0
       end
0