Merge branch 'default_fix' of https://github.com/gsterndale/couchrest_model into default_fix

2011-02-02 20:11:27 +01:00 · 2011-02-02 20:11:27 +01:00 · d53c98252e
commit d53c98252e
parent a6db1af0c0 b5a2307a95
2 changed files with 10 additions and 2 deletions
--- a/lib/couchrest/model/property.rb
+++ b/lib/couchrest/model/property.rb
@ -58,8 +58,8 @@ module CouchRest::Model
      if default.class == Proc
        default.call
      else
-        # Marshal.load(Marshal.dump(default)) # Removed as there are no failing tests and caused mutex errors
-        default
+        # TODO identify cause of mutex errors
+        Marshal.load(Marshal.dump(default))
      end
    end