Ensure :not_found status is returned, catching RecordNotFound doesn't work as isnt...

[rails.git] / app / controllers / old_node_controller.rb

diff --git a/app/controllers/old_node_controller.rb b/app/controllers/old_node_controller.rb
index 0976a0c9aae87c679bd254b028b45830f9a47077..2590fd24aefbac64035b0e31e7c04dfa76de1612 100644 (file)
--- a/app/controllers/old_node_controller.rb
+++ b/app/controllers/old_node_controller.rb
@@ -26,6 +26,11 @@ class OldNodeController < ApplicationController
   def version
     begin
       old_node = OldNode.find(:first, :conditions => {:id => params[:id], :version => params[:version]} )
   def version
     begin
       old_node = OldNode.find(:first, :conditions => {:id => params[:id], :version => params[:version]} )

+      if old_node.nil?
+        # (RecordNotFound is not raised with find :first...)
+        render :nothing => true, :status => :not_found
+        return
+      end

       
       response.headers['Last-Modified'] = old_node.timestamp.rfc822
 
       
       response.headers['Last-Modified'] = old_node.timestamp.rfc822
 


@@ -33,8 +38,6 @@ class OldNodeController < ApplicationController
       doc.root << old_node.to_xml_node
 
       render :text => doc.to_s, :content_type => "text/xml"
       doc.root << old_node.to_xml_node
 
       render :text => doc.to_s, :content_type => "text/xml"

-    rescue ActiveRecord::RecordNotFound
-      render :nothing => true, :status => :not_found

     rescue
       render :nothing => true, :status => :internal_server_error
     end
     rescue
       render :nothing => true, :status => :internal_server_error
     end