0
@@ -1270,10 +1270,9 @@ module ActiveRecord
0
               association.create_through_record(new_value)
0
               self.send(reflection.name, new_value)
0
             else
0
-              association.replace(new_value)              
0
+              association.replace(new_value)
0
+              instance_variable_set(ivar, new_value.nil? ? nil : association)
0
             end
0
-
0
-            instance_variable_set(ivar, new_value.nil? ? nil : association)
0
           end
0
 
0
           define_method("set_#{reflection.name}_target") do |target|

0
@@ -22,6 +22,10 @@ module ActiveRecord
0
     
0
       def find_target
0
         super.first
0
+      end
0
+
0
+      def reset_target!
0
+        @target = nil
0
       end        
0
     end        
0
   end

0
@@ -101,4 +101,13 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
0
     assert_equal clubs(:crazy_club), members[0].sponsor_club
0
   end
0
 
0
+  def test_uninitialized_has_one_through_should_return_nil_for_unsaved_record
0
+    assert_nil Member.new.club
0
+  end
0
+
0
+  def test_assigning_association_correctly_assigns_target
0
+    new_member = Member.create(:name => "Chris")
0
+    new_member.club = new_club = Club.create(:name => "LRUG")
0
+    assert_equal new_club, new_member.club.target
0
+  end
0
 end