fixed GH pocoproject#410: Bug in JSON::Object.stringify() in 1.5.2

aleks-f · aleks-f · commit 4d366250e1f0 · 2014-04-28T21:43:57.000-05:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -54,6 +54,7 @@ Release 1.5.3 (2014-05-xx)
 - added runtest script for windows
 - added SQlite Full Text Search support
 - added Thread::trySleep() and Thread::wakeUp()
+- fixed GH #410: Bug in JSON::Object.stringify() in 1.5.2
 
 Release 1.5.2 (2013-09-16)
 ==========================
diff --git a/JSON/include/Poco/JSON/Object.h b/JSON/include/Poco/JSON/Object.h
@@ -246,7 +246,7 @@ class JSON_API Object
 
 			Stringifier::stringify(getValue(it), out, indent + step, step);
 
-			if ( ++it != container.end() ) out << ',';
+			if (++it != container.end()) out << ',';
 
 			if (step > 0) out << std::endl;
 		}
diff --git a/JSON/src/Object.cpp b/JSON/src/Object.cpp
@@ -127,7 +127,7 @@ const std::string& Object::getKey(KeyPtrList::const_iterator& iter) const
 	ValueMap::const_iterator end = _values.end();
 	for (; it != end; ++it)
 	{
-		if (it->second == **iter) return it->first;
+		if (&it->second == *iter) return it->first;
 	}
 
 	throw NotFoundException((*iter)->convert<std::string>());
diff --git a/JSON/testsuite/src/JSONTest.cpp b/JSON/testsuite/src/JSONTest.cpp
@@ -1215,12 +1215,13 @@ void JSONTest::testPrintHandler()
 
 void JSONTest::testStringify()
 {
-	Poco::JSON::Object obj;
-	obj.set("one","two");
-	obj.stringify(std::cout,4);  //this works 
-	obj.stringify(std::cout,1);  //this never returns
-	std::cout << std::endl;
-
+	Object jObj(false);
+	jObj.set("foo", 0);
+	jObj.set("bar", 0);
+	jObj.set("baz", 0);
+	std::stringstream ss;
+	jObj.stringify(ss);
+	assert(ss.str() == "{\"bar\":0,\"baz\":0,\"foo\":0}");
 
 	std::string json = "{ \"Simpsons\" : { \"husband\" : { \"name\" : \"Homer\" , \"age\" : 38 }, \"wife\" : { \"name\" : \"Marge\", \"age\" : 36 }, "
 						"\"children\" : [ \"Bart\", \"Lisa\", \"Maggie\" ], "
@@ -1348,6 +1349,14 @@ void JSONTest::testStringify()
 
 void JSONTest::testStringifyPreserveOrder()
 {
+	Object jObj(true);
+	jObj.set("foo", 0);
+	jObj.set("bar", 0);
+	jObj.set("baz", 0);
+	std::stringstream ss;
+	jObj.stringify(ss);
+	assert(ss.str() == "{\"foo\":0,\"bar\":0,\"baz\":0}");
+
 	std::string json = "{ \"Simpsons\" : { \"husband\" : { \"name\" : \"Homer\" , \"age\" : 38 }, \"wife\" : { \"name\" : \"Marge\", \"age\" : 36 }, "
 						"\"children\" : [ \"Bart\", \"Lisa\", \"Maggie\" ], "
 						"\"address\" : { \"number\" : 742, \"street\" : \"Evergreen Terrace\", \"town\" : \"Springfield\" } } }";

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ class JSON_API Object`
`246`	`246`
`247`	`247`	`Stringifier::stringify(getValue(it), out, indent + step, step);`
`248`	`248`
`249`		`- if ( ++it != container.end() ) out << ',';`
	`249`	`+ if (++it != container.end()) out << ',';`
`250`	`250`
`251`	`251`	`if (step > 0) out << std::endl;`
`252`	`252`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ const std::string& Object::getKey(KeyPtrList::const_iterator& iter) const`
`127`	`127`	`ValueMap::const_iterator end = _values.end();`
`128`	`128`	`for (; it != end; ++it)`
`129`	`129`	`{`
`130`		`- if (it->second == **iter) return it->first;`
	`130`	`+ if (&it->second == *iter) return it->first;`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`throw NotFoundException((*iter)->convert<std::string>());`