From ff8e5ae42e2f2f141ff2a3ba80a397bafd08d785 Mon Sep 17 00:00:00 2001
From: Klaas Pieter Annema <klaaspieter@annema.me>
Date: Wed, 7 Jul 2010 15:35:12 +0200
Subject: [PATCH] save _replacedKeys on the class in stead of the object
 instance

reviewed: Ross
---
 Foundation/CPKeyValueObserving.j | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Foundation/CPKeyValueObserving.j b/Foundation/CPKeyValueObserving.j
index 0ff9fdd26..6ea9c9a42 100644
--- a/Foundation/CPKeyValueObserving.j
+++ b/Foundation/CPKeyValueObserving.j
@@ -213,7 +213,6 @@ var kvoNewAndOld = CPKeyValueObservingOptionNew|CPKeyValueObservingOptionOld,
 
     _targetObject       = aTarget;
     _nativeClass        = [aTarget class];
-    _replacedKeys       = [CPSet set];
     _observersForKey    = {};
     _changesForKey      = {};
     _observersForKeyLength = 0;
@@ -230,6 +229,7 @@ var kvoNewAndOld = CPKeyValueObservingOptionNew|CPKeyValueObservingOptionOld,
     if (existingKVOClass)
     {
         _targetObject.isa = existingKVOClass;
+        _replacedKeys = existingKVOClass._replacedKeys;
         return;
     }
 
@@ -237,6 +237,9 @@ var kvoNewAndOld = CPKeyValueObservingOptionNew|CPKeyValueObservingOptionOld,
 
     objj_registerClassPair(kvoClass);
 
+    _replacedKeys = [CPSet set];
+    kvoClass._replacedKeys = _replacedKeys;
+
     //copy in the methods from our model subclass
     var methodList = _CPKVOModelSubclass.method_list,
         count = methodList.length,
@@ -293,6 +296,7 @@ var kvoNewAndOld = CPKeyValueObservingOptionNew|CPKeyValueObservingOptionOld,
             var theMethod = class_getInstanceMethod(_nativeClass, theSelector);
 
             class_addMethod(_targetObject.isa, theSelector, theReplacementMethod(aKey, theMethod), "");
+            [_replacedKeys addObject:aKey];
         }
     }