projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #13369 "Merge branch '13369-update-ubuntu1404-dockerfile'".
[arvados.git]
/
services
/
api
/
lib
/
serializers.rb
diff --git
a/services/api/lib/serializers.rb
b/services/api/lib/serializers.rb
index ec6fe199729cdd663eda72497290a5e269b120cf..37734e0bb41dce88500b143fab0a71102b1b8b33 100644
(file)
--- a/
services/api/lib/serializers.rb
+++ b/
services/api/lib/serializers.rb
@@
-32,7
+32,10
@@
class Serializer
end
def self.load(s)
end
def self.load(s)
- if s.nil?
+ if s.is_a?(object_class)
+ # Rails already deserialized for us
+ s
+ elsif s.nil?
object_class.new()
elsif s[0] == first_json_char
SafeJSON.load(s)
object_class.new()
elsif s[0] == first_json_char
SafeJSON.load(s)