lib/transporter/transporter.rb in rsence-2.0.0.11 vs lib/transporter/transporter.rb in rsence-2.0.1.12

@@ -80,26 +80,23 @@
   
     def servlet( request_type, request, response )
       broker_urls = RSence.config[:broker_urls]
       uri = request.fullpath
     
-      if request_type == :post
+      if @plugins.match_servlet( request_type, request, response, {} )
+        return true
+      elsif request_type == :post
         ## /x handles xhr without cookies
         if uri == broker_urls[:x] and @sessions.accept_requests
           xhr( request, response, { :cookies => true, :servlet => false } )
           return true
         ## /hello handles the first xhr (with cookies, for session key)
         elsif uri == broker_urls[:hello] and @sessions.accept_requests
           xhr( request, response, { :cookies => true, :servlet => false } )
           return true
-        else
-          session = {}
-          return @plugins.match_servlet( request_type, request, response, session )
         end
-      else
-        session = {}
-        return @plugins.match_servlet( request_type, request, response, session )
       end
+      return false
     end
   
     # wrapper for the session manager stop client functionality
     def xhr_error_handler(msg,err_name,err_extra_descr='')
       @sessions.stop_client_with_message( msg,