From 57d56aa9330d054ad2cc88da777117a8eee9394b Mon Sep 17 00:00:00 2001
From: Cristian Bica <cristian.bica@gmail.com>
Date: Wed, 3 Sep 2014 15:06:10 +0300
Subject: [PATCH] [Active Job] Try to deserialize with GlobalID only strings
 and globalids

---
 activejob/lib/active_job/arguments.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/activejob/lib/active_job/arguments.rb b/activejob/lib/active_job/arguments.rb
index 9d4490b0fc..6eeca2861d 100644
--- a/activejob/lib/active_job/arguments.rb
+++ b/activejob/lib/active_job/arguments.rb
@@ -56,8 +56,10 @@ module ActiveJob
           argument.map { |arg| deserialize_argument(arg) }
         when Hash
           Hash[ argument.map { |key, value| [ key, deserialize_argument(value) ] } ].with_indifferent_access
-        else
+        when String, GlobalID
           GlobalID::Locator.locate(argument) || argument
+        else
+          argument
         end
       end