add a branch to eliminate multiple nil checks

if we add an else conditional to the `presence` check, we can eliminate
the second `||` branch in the caller

1 files changed, 5 insertions, 3 deletions

diff --git a/actionpack/lib/action_dispatch/middleware/request_id.rb b/actionpack/lib/action_dispatch/middleware/request_id.rb
index 303f8e8c23..1555ff72af 100644
--- a/actionpack/lib/action_dispatch/middleware/request_id.rb
+++ b/actionpack/lib/action_dispatch/middleware/request_id.rb
@@ -20,14 +20,16 @@ module ActionDispatch
 
     def call(env)
       req = ActionDispatch::Request.new env
-      req.request_id = external_request_id(req) || internal_request_id
+      req.request_id = make_request_id(req.x_request_id)
       @app.call(env).tap { |_status, headers, _body| headers[X_REQUEST_ID] = req.request_id }
     end
 
     private
-      def external_request_id(req)
-        if request_id = req.x_request_id.presence
+      def make_request_id(request_id)
+        if request_id.presence
           request_id.gsub(/[^\w\-]/, "".freeze).first(255)
+        else
+          internal_request_id
         end
       end