Make test for a "zero hour" block more robust

[rails.git] / app / models / node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index 578735688be4253bb90bef0967c9f7244aee5de4..f8559dca75d74431153342f4c4c987281a5354e8 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -49,7 +49,7 @@ class Node < ActiveRecord::Base
 
   # Read in xml as text and return it's Node object representation
   def self.from_xml(xml, create = false)
 
   # Read in xml as text and return it's Node object representation
   def self.from_xml(xml, create = false)

-    p = XML::Parser.string(xml)
+    p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR)

     doc = p.parse
 
     doc.find("//osm/node").each do |pt|
     doc = p.parse
 
     doc.find("//osm/node").each do |pt|


@@ -232,10 +232,14 @@ class Node < ActiveRecord::Base
 
   def save_with_history!
     t = Time.now.getutc
 
   def save_with_history!
     t = Time.now.getutc

+
+    self.version += 1
+    self.timestamp = t
+

     Node.transaction do
     Node.transaction do

-      self.version += 1
-      self.timestamp = t
-      save!
+      # clone the object before saving it so that the original is
+      # still marked as dirty if we retry the transaction
+      clone.save!

 
       # Create a NodeTag
       tags = self.tags
 
       # Create a NodeTag
       tags = self.tags