@@ -239,16 +239,16 @@ class JSON_API Object
 		out << '}';
 	}
 
-	typedef std::deque<Dynamic::Var*>                   KeyPtrList;
-	typedef Poco::DynamicStruct::Ptr                    StructPtr;
+	typedef std::deque<std::string>  KeyList;
+	typedef Poco::DynamicStruct::Ptr StructPtr;
 
 	const std::string& getKey(ValueMap::const_iterator& it) const;
 	const Dynamic::Var& getValue(ValueMap::const_iterator& it) const;
-	const std::string& getKey(KeyPtrList::const_iterator& it) const;
-	const Dynamic::Var& getValue(KeyPtrList::const_iterator& it) const;
+	const std::string& getKey(KeyList::const_iterator& it) const;
+	const Dynamic::Var& getValue(KeyList::const_iterator& it) const;
 
 	ValueMap          _values;
-	KeyPtrList        _keys;
+	KeyList           _keys;
 	bool              _preserveInsOrder;
 	mutable StructPtr _pStruct;
 };
@@ -318,9 +318,9 @@ inline const Dynamic::Var& Object::getValue(ValueMap::const_iterator& it) const
 }
 
 
-inline const Dynamic::Var& Object::getValue(KeyPtrList::const_iterator& it) const
+inline const Dynamic::Var& Object::getValue(KeyList::const_iterator& it) const
 {
-	return **it;
+	return _values.at(*it);
 }
 
 
 
@@ -101,16 +101,16 @@ void Object::stringify(std::ostream& out, unsigned int indent, int step) const
 }
 
 
-const std::string& Object::getKey(KeyPtrList::const_iterator& iter) const
+const std::string& Object::getKey(KeyList::const_iterator& iter) const
 {
 	ValueMap::const_iterator it = _values.begin();
 	ValueMap::const_iterator end = _values.end();
 	for (; it != end; ++it)
 	{
-		if (it->second == **iter) return it->first;
+		if (it->first == *iter) return it->first;
 	}
 
-	throw NotFoundException((*iter)->convert<std::string>());
+	throw NotFoundException(*iter);
 }
 
 
@@ -119,13 +119,13 @@ void Object::set(const std::string& key, const Dynamic::Var& value)
 	_values[key] = value;
 	if (_preserveInsOrder)
 	{
-		KeyPtrList::iterator it = _keys.begin();
-		KeyPtrList::iterator end = _keys.end();
+		KeyList::iterator it = _keys.begin();
+		KeyList::iterator end = _keys.end();
 		for (; it != end; ++it)
 		{
-			if (key == **it) return;
+			if (key == *it) return;
 		}
-		_keys.push_back(&_values[key]);
+		_keys.push_back(key);
 	}
 }
Original file line number	Diff line number	Diff line change
`@@ -101,16 +101,16 @@ void Object::stringify(std::ostream& out, unsigned int indent, int step) const`
`101`	`101`	`}`
`102`	`102`
`103`	`103`
`104`		`-const std::string& Object::getKey(KeyPtrList::const_iterator& iter) const`
	`104`	`+const std::string& Object::getKey(KeyList::const_iterator& iter) const`
`105`	`105`	`{`
`106`	`106`	`ValueMap::const_iterator it = _values.begin();`
`107`	`107`	`ValueMap::const_iterator end = _values.end();`
`108`	`108`	`for (; it != end; ++it)`
`109`	`109`	`{`
`110`		`- if (it->second == **iter) return it->first;`
	`110`	`+ if (it->first == *iter) return it->first;`
`111`	`111`	`}`
`112`	`112`
`113`		`- throw NotFoundException((*iter)->convert<std::string>());`
	`113`	`+ throw NotFoundException(*iter);`
`114`	`114`	`}`
`115`	`115`
`116`	`116`
`@@ -119,13 +119,13 @@ void Object::set(const std::string& key, const Dynamic::Var& value)`
`119`	`119`	`_values[key] = value;`
`120`	`120`	`if (_preserveInsOrder)`
`121`	`121`	`{`
`122`		`- KeyPtrList::iterator it = _keys.begin();`
`123`		`- KeyPtrList::iterator end = _keys.end();`
	`122`	`+ KeyList::iterator it = _keys.begin();`
	`123`	`+ KeyList::iterator end = _keys.end();`
`124`	`124`	`for (; it != end; ++it)`
`125`	`125`	`{`
`126`		`- if (key == **it) return;`
	`126`	`+ if (key == *it) return;`
`127`	`127`	`}`
`128`		`- _keys.push_back(&_values[key]);`
	`128`	`+ _keys.push_back(key);`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`