Fix for thread resolve service and process feed service url method

diff --git a/app/services/fetch_atom_service.rb b/app/services/fetch_atom_service.rb
index f2625dcaa3133721b2684470be70e3babb3c804d..5f00bf8010ef9121edc13338fd3e25a97de022a1 100644 (file)
--- a/app/services/fetch_atom_service.rb
+++ b/app/services/fetch_atom_service.rb
@@ -3,6 +3,11 @@ class FetchAtomService < BaseService
     response = http_client.head(url)
 
     Rails.logger.debug "Remote status HEAD request returned code #{response.code}"
+
+    response = http_client.get(url) if response.code == 405
+
+    Rails.logger.debug "Remote status GET request returned code #{response.code}"
+
     return nil if response.code != 200
 
     if response.mime_type == 'application/atom+xml'

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 19a58ee29e6def3cdbe4c09d747834f5bb59310b..1fac60fe5becf941fd4229c95bb34daefc9f3567 100644 (file)
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -175,8 +175,7 @@ class ProcessFeedService < BaseService
 
     def url(xml = @xml)
       link = xml.at_xpath('./xmlns:link[@rel="alternate"]')
-      link['href'] unless link.nil?
-      nil
+      link.nil? ? nil : link['href']
     end
 
     def content(xml = @xml)