do find_object_by_uuid after setting up api token

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1c7f9fc94776da06d583eb8f0de17d2b8dfd9abd..3dda0b08c0e789eed2cdeee00302985afa5259f9 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,7 +1,7 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  before_filter :find_object_by_uuid, :except => [:index, :render_exception, :render_not_found]
   around_filter :thread_with_api_token, :except => [:render_exception, :render_not_found]
+  before_filter :find_object_by_uuid, :except => [:index, :render_exception, :render_not_found]
 
   unless Rails.application.config.consider_all_requests_local
     rescue_from Exception,