summaryrefslogtreecommitdiffstats
path: root/metrics/src/tests/metricmanagertest.cpp
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@gmail.com>2017-10-02 18:48:28 +0200
committerGitHub <noreply@github.com>2017-10-02 18:48:28 +0200
commit68615e196ddc52d13b1df6821fb17f83ff4e832d (patch)
tree77f5f9d557628f3e4fca620b13e0a010e43c312d /metrics/src/tests/metricmanagertest.cpp
parentf0700d41ef742094255bcbe2dacf780b86ea9e1d (diff)
parent31a1e77a22c08fe93fa29daafdf301c69914d694 (diff)
Merge pull request #3621 from vespa-engine/revert-3612-revert-3587-havardpe/avoid-reading-past-json-value-in-slime-json-parser
Revert "Revert "Havardpe/avoid reading past json value in slime json parser""
Diffstat (limited to 'metrics/src/tests/metricmanagertest.cpp')
-rw-r--r--metrics/src/tests/metricmanagertest.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/metrics/src/tests/metricmanagertest.cpp b/metrics/src/tests/metricmanagertest.cpp
index a086cf70ca9..e9934b6dbbb 100644
--- a/metrics/src/tests/metricmanagertest.cpp
+++ b/metrics/src/tests/metricmanagertest.cpp
@@ -779,7 +779,7 @@ void MetricManagerTest::testJsonOutput()
using namespace vespalib::slime;
vespalib::Slime slime;
size_t parsed = JsonFormat::decode(vespalib::Memory(jsonData), slime);
- if (jsonData.size() != parsed) {
+ if (parsed == 0) {
vespalib::SimpleBuffer buffer;
JsonFormat::encode(slime, buffer, false);
std::ostringstream ost;