0
@@ -10,18 +10,17 @@ module ActiveRecord
0
     
0
     def reset
0
       @target = nil
0
-      @loaded = false
0
     end
0
 
0
     def load
0
       reset
0
-      load_target
0
+      @target = find_target(true)
0
+      update_cache(@target)
0
     end
0
 
0
     def reload
0
       @owner.instance_variable_set("@#{@reflection.name}", nil)
0
-      reset
0
-      @target = find_target(true)
0
+      load
0
       @owner.send @reflection.name
0
     end
0
     
0
@@ -32,32 +31,16 @@ module ActiveRecord
0
       @owner.instance_variable_set("@#{@reflection.name}", nil)
0
     end
0
 
0
-    def loaded?
0
-      @loaded
0
-    end
0
-    
0
-    def loaded
0
-      @loaded = true
0
-    end
0
-    
0
     def target
0
       @target
0
     end
0
 
0
     protected
0
       
0
-      def load_target
0
-        return nil unless defined?(@loaded)
0
-        @target = find_target unless loaded?
0
-        @loaded = true
0
-        @target
0
-      end
0
-
0
       def find_target(skip_cache = false)
0
         target = find_target_from_cache unless skip_cache
0
         unless target
0
           target ||= @reflection.options[:sql] ? find_target_by_sql : find_target_by_eval
0
-          update_cache(target)
0
         end
0
         target
0
       end