closes #11

catmando · catmando · commit 4ab24127f5e7 · 2015-12-31T15:08:05.000-05:00
diff --git a/lib/reactive_record/active_record/reactive_record/isomorphic_base.rb b/lib/reactive_record/active_record/reactive_record/isomorphic_base.rb
@@ -359,7 +359,7 @@ def self.find_record(model, id, vector, save)
               object.send(method)
             end
           end
-          if id and (found.nil? or !(found.class <= model) or (!found.id.nil? and found.id.to_s != id.to_s))
+          if id and (found.nil? or !(found.class <= model) or (found.id and found.id.to_s != id.to_s))
             raise "Inconsistent data sent to server - #{model.name}.find(#{id}) != [#{vector}]"
           end
           found
@@ -506,7 +506,7 @@ def self.save_records(models, associations, acting_user, validate, save)
 
           else
 
-            vectors.each { |vector, model| model.reload unless model.nil? or model.new_record? }
+            vectors.each { |vector, model| model.reload unless model.nil? or model.new_record? or model.frozen? }
             vectors
 
           end
diff --git a/spec/test_app/Gemfile.lock b/spec/test_app/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    reactive-record (0.7.33)
+    reactive-record (0.7.34)
       opal-browser
       opal-rails
       rails (>= 3.2.13)
