From 569c6920013393d85a025de8b29e7d0b48843aa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radovan=20=C4=8Cerven=C3=BD?= <radovan.cerveny@gmail.com>
Date: Sat, 5 Mar 2016 00:40:04 +0100
Subject: [PATCH] small fixed in xml parsing
---
.../provisioner/MeasurementProvisionerResultsXml.cpp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/ameasure2/src/provisioner/MeasurementProvisionerResultsXml.cpp b/ameasure2/src/provisioner/MeasurementProvisionerResultsXml.cpp
index 8f6e0c4549..221b9ce6a6 100644
--- a/ameasure2/src/provisioner/MeasurementProvisionerResultsXml.cpp
+++ b/ameasure2/src/provisioner/MeasurementProvisionerResultsXml.cpp
@@ -236,11 +236,17 @@ void MeasurementProvisionerResultsXml::parsePipelineStatus ( MPRPipelineResults
FromXMLParserHelper::popToken ( iter, Token::TokenType::END_ELEMENT, EXIT_CODE_TAG );
} else if ( data == ERROR_ORIGIN_TAG ) {
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, ERROR_ORIGIN_TAG );
- mprpr.pipelineStatus.errorOrigin = FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER );
+
+ if ( FromXMLParserHelper::isTokenType ( iter, Token::TokenType::CHARACTER ) )
+ mprpr.pipelineStatus.errorOrigin = FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER );
+
FromXMLParserHelper::popToken ( iter, Token::TokenType::END_ELEMENT, ERROR_ORIGIN_TAG );
} else if ( data == ERROR_VALUE_TAG ) {
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, ERROR_VALUE_TAG );
- mprpr.pipelineStatus.errorValue = FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER );
+
+ if ( FromXMLParserHelper::isTokenType ( iter, Token::TokenType::CHARACTER ) )
+ mprpr.pipelineStatus.errorValue = FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER );
+
FromXMLParserHelper::popToken ( iter, Token::TokenType::END_ELEMENT, ERROR_VALUE_TAG );
} else {
break;
--
GitLab