Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop

libqwebthree/QWebThree.cpp

@@ -140,7 +140,7 @@ void QWebThree::onDataProcessed(QString _json, QString _addInfo)
 		for (int i = 0; i < resultsArray.size(); i++)
 		{
 			QJsonObject elem = resultsArray[i].toObject();
-			if (elem.contains("result"))
+			if (elem["result"].isArray() && elem["result"].toArray().size() > 0)
 			{
 				QJsonObject res;
 				res["_event"] = _addInfo;

libweb3jsonrpc/WebThreeStubServerBase.cpp

@@ -84,7 +84,7 @@ static Json::Value toJson(dev::eth::LocalisedLogEntry const& _e)
 
 static Json::Value toJson(dev::eth::LocalisedLogEntries const& _es)	// commented to avoid warning. Uncomment once in use @ poC-7.
 {
-	Json::Value res;
+	Json::Value res(Json::arrayValue);
 	for (dev::eth::LocalisedLogEntry const& e: _es)
 		res.append(toJson(e));
 	return res;