diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-08-24 12:02:41 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-08-24 12:02:41 +0200 |
| commit | b91d0e8f7d309500df79bffa9017fa2d9fbf2c05 (patch) | |
| tree | cdd30dfd83ffea3d0b9e9b2b4f0b16f15cccfb9c /lib/action_cable | |
| parent | 5ee5e419be5c190aaec001c497db4aa76264b70e (diff) | |
| parent | c74f8df1217e85d2418da43c74c205b888bc2600 (diff) | |
| download | rails-b91d0e8f7d309500df79bffa9017fa2d9fbf2c05.tar.gz rails-b91d0e8f7d309500df79bffa9017fa2d9fbf2c05.tar.bz2 rails-b91d0e8f7d309500df79bffa9017fa2d9fbf2c05.zip | |
Merge pull request #65 from mrlhumphreys/support-identifiers-without-to-global-id
Support connection identifiers that don't implement to_global_id
Diffstat (limited to 'lib/action_cable')
| -rw-r--r-- | lib/action_cable/connection/identification.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/action_cable/connection/identification.rb b/lib/action_cable/connection/identification.rb index 1be6f9ac76..701e6885ad 100644 --- a/lib/action_cable/connection/identification.rb +++ b/lib/action_cable/connection/identification.rb @@ -27,7 +27,7 @@ module ActionCable private def connection_gid(ids) - ids.map { |o| o.to_global_id.to_s }.sort.join(":") + ids.map { |o| (o.try(:to_global_id) || o).to_s }.sort.join(":") end end end |