Tweak to move model lookup functionality into the Handler base class where it belongs. Robustifying the request sanitization a bit more.

3 files changed, 1 insertions, 2 deletions

diff --git a/lib/puppet/network/http/handler.rb b/lib/puppet/network/http/handler.rb
index 54cec417b..77df113e6 100644
--- a/lib/puppet/network/http/handler.rb
+++ b/lib/puppet/network/http/handler.rb
@@ -2,6 +2,7 @@ class Puppet::Network::HTTP::Handler
     def initialize(args = {})
         raise ArgumentError unless @server = args[:server]
         raise ArgumentError unless @handler = args[:handler]
+        @model = find_model_for_handler(@handler)
         register_handler
     end
     
diff --git a/lib/puppet/network/http/mongrel/rest.rb b/lib/puppet/network/http/mongrel/rest.rb
index 8f3de957e..4c795481b 100644
--- a/lib/puppet/network/http/mongrel/rest.rb
+++ b/lib/puppet/network/http/mongrel/rest.rb
@@ -5,7 +5,6 @@ class Puppet::Network::HTTP::MongrelREST < Puppet::Network::HTTP::Handler
   private
     
     def register_handler
-        @model = find_model_for_handler(@handler)
         @server.register('/' + @handler.to_s, self)
         @server.register('/' + @handler.to_s + 's', self)
     end
diff --git a/lib/puppet/network/http/webrick/rest.rb b/lib/puppet/network/http/webrick/rest.rb
index cefffd76d..ed29cfb75 100644
--- a/lib/puppet/network/http/webrick/rest.rb
+++ b/lib/puppet/network/http/webrick/rest.rb
@@ -10,7 +10,6 @@ class Puppet::Network::HTTP::WEBrickREST < Puppet::Network::HTTP::Handler
   private
     
     def register_handler
-        @model = find_model_for_handler(@handler)
         @server.mount('/' + @handler.to_s, self)
         @server.mount('/' + @handler.to_s + 's', self)
     end