We don't need an extra method for the amf controller for saving nodes, just catch...

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

diff --git a/app/controllers/old_way_controller.rb b/app/controllers/old_way_controller.rb
index da4e26d67be706e07aebd6297b38838ce73f7813..2f110321607e6d66225055a22d1a4ad05c1801b2 100644 (file)
--- a/app/controllers/old_way_controller.rb
+++ b/app/controllers/old_way_controller.rb
@@ -2,7 +2,7 @@ class OldWayController < ApplicationController
   require 'xml/libxml'
 
   session :off
-  before_filter :check_read_availability
+  before_filter :check_api_readable
   after_filter :compress_output
 
   def history
@@ -26,6 +26,11 @@ class OldWayController < ApplicationController
   def version
     begin
       old_way = OldWay.find(:first, :conditions => {:id => params[:id], :version => params[:version]} )
+      if old_way.nil?
+        # (RecordNotFound is not raised with find :first...)
+        render :nothing => true, :status => :not_found
+        return
+      end
       
       response.headers['Last-Modified'] = old_way.timestamp.rfc822
       
@@ -33,8 +38,6 @@ class OldWayController < ApplicationController
       doc.root << old_way.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