diff options
| author | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-04-09 14:56:28 +0200 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2016-04-25 22:19:34 +0200 |
| commit | bc25012753704943808bb8f71d75f27f68c13da9 (patch) | |
| tree | 6ef71902aa68e3b6058a0ba47c17ddfbd767dcdb /src/core/parser/stack/DocumentHandler.cpp | |
| parent | 8e27a8e87344e187d67407a37c8818f91ed016fa (diff) | |
fixed a bug in the DocumentHandler which lead to problems in case of empty explicit fields.
Diffstat (limited to 'src/core/parser/stack/DocumentHandler.cpp')
| -rw-r--r-- | src/core/parser/stack/DocumentHandler.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/parser/stack/DocumentHandler.cpp b/src/core/parser/stack/DocumentHandler.cpp index ce6267f..04f79fb 100644 --- a/src/core/parser/stack/DocumentHandler.cpp +++ b/src/core/parser/stack/DocumentHandler.cpp @@ -634,11 +634,12 @@ void DocumentChildHandler::end() case HandlerType::COMMAND: case HandlerType::ANNOTATION_START: case HandlerType::TOKEN: - // In case of explicit fields we do not want to pop something from - // the stack. - if (!isExplicitField) { + if(!isExplicitField){ // pop the "main" element. scope().pop(logger()); + } else{ + // in case of explicit fields, roll back. + rollbackPath(); } break; case HandlerType::ANNOTATION_END: @@ -692,8 +693,8 @@ void DocumentChildHandler::fieldEnd() { if (!isExplicitField) { popTokens(); + rollbackPath(); } - rollbackPath(); } bool DocumentChildHandler::convertData(Handle<FieldDescriptor> field, |