aboutsummaryrefslogtreecommitdiffstats
path: root/lib/action_cable/connection
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2015-10-09 09:11:26 -0500
committerPratik Naik <pratiknaik@gmail.com>2015-10-09 09:11:26 -0500
commitaa3c1154edfacecbbf676af4d8728d8674d97cf4 (patch)
tree2f8b49af89f0736b4d3d077e6d5bf238321d2e72 /lib/action_cable/connection
parent1d4d274b0777793a8d39f76ded6a6b292f97abb0 (diff)
downloadrails-aa3c1154edfacecbbf676af4d8728d8674d97cf4.tar.gz
rails-aa3c1154edfacecbbf676af4d8728d8674d97cf4.tar.bz2
rails-aa3c1154edfacecbbf676af4d8728d8674d97cf4.zip
Be sure not to cache an empty string as the connection_identifier
Diffstat (limited to 'lib/action_cable/connection')
-rw-r--r--lib/action_cable/connection/identification.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/action_cable/connection/identification.rb b/lib/action_cable/connection/identification.rb
index 701e6885ad..4e9beac058 100644
--- a/lib/action_cable/connection/identification.rb
+++ b/lib/action_cable/connection/identification.rb
@@ -22,7 +22,11 @@ module ActionCable
# Return a single connection identifier that combines the value of all the registered identifiers into a single gid.
def connection_identifier
- @connection_identifier ||= connection_gid identifiers.map { |id| instance_variable_get("@#{id}") }.compact
+ if @connection_identifier.blank?
+ @connection_identifier = connection_gid identifiers.map { |id| instance_variable_get("@#{id}") }.compact
+ end
+
+ @connection_identifier
end
private