Skip to content

Commit ac74388

Browse files
Add wrongly removed if check for element text presence
1 parent e4c5fad commit ac74388

2 files changed

Lines changed: 14 additions & 10 deletions

File tree

  • modules
    • flowable-cmmn-converter/src/main/java/org/flowable/cmmn/converter/util
    • flowable-dmn-xml-converter/src/main/java/org/flowable/dmn/converter/util

modules/flowable-cmmn-converter/src/main/java/org/flowable/cmmn/converter/util/CmmnXmlUtil.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,13 @@ public static ExtensionElement parseExtensionElement(XMLStreamReader xtr) throws
7676
while (!readyWithExtensionElement && xtr.hasNext()) {
7777
xtr.next();
7878
if (xtr.isCharacters() || XMLStreamReader.CDATA == xtr.getEventType()) {
79-
if (extensionElement.getElementText() != null) {
80-
extensionElement.setElementText(extensionElement.getElementText() + xtr.getText().trim());
81-
82-
} else {
83-
extensionElement.setElementText(xtr.getText().trim());
79+
if (StringUtils.isNotEmpty(xtr.getText().trim())) {
80+
if (extensionElement.getElementText() != null) {
81+
extensionElement.setElementText(extensionElement.getElementText() + xtr.getText().trim());
82+
83+
} else {
84+
extensionElement.setElementText(xtr.getText().trim());
85+
}
8486
}
8587

8688
} else if (xtr.isStartElement()) {

modules/flowable-dmn-xml-converter/src/main/java/org/flowable/dmn/converter/util/DmnXMLUtil.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,13 @@ public static DmnExtensionElement parseExtensionElement(XMLStreamReader xtr) thr
143143
while (!readyWithExtensionElement && xtr.hasNext()) {
144144
xtr.next();
145145
if (xtr.isCharacters() || XMLStreamReader.CDATA == xtr.getEventType()) {
146-
if (extensionElement.getElementText() != null) {
147-
extensionElement.setElementText(extensionElement.getElementText() + xtr.getText().trim());
148-
149-
} else {
150-
extensionElement.setElementText(xtr.getText().trim());
146+
if (StringUtils.isNotEmpty(xtr.getText().trim())) {
147+
if (extensionElement.getElementText() != null) {
148+
extensionElement.setElementText(extensionElement.getElementText() + xtr.getText().trim());
149+
150+
} else {
151+
extensionElement.setElementText(xtr.getText().trim());
152+
}
151153
}
152154

153155
} else if (xtr.isStartElement()) {

0 commit comments

Comments
 (0)