14717: Rename WebsocketKeepaliveTimeout to SendTimeout and add a comment

[arvados.git] / services / api / lib / serializers.rb

diff --git a/services/api/lib/serializers.rb b/services/api/lib/serializers.rb
index e412f63f622dfca040afc418df856714e07dd0d3..37734e0bb41dce88500b143fab0a71102b1b8b33 100644 (file)
--- a/services/api/lib/serializers.rb
+++ b/services/api/lib/serializers.rb
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 require 'safe_json'
 
 class Serializer
@@ -28,7 +32,10 @@ class Serializer
   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)