diff --git a/src/main/java/org/apache/ibatis/builder/xml/XMLIncludeTransformer.java b/src/main/java/org/apache/ibatis/builder/xml/XMLIncludeTransformer.java index 007e992d9f7..948832e7321 100644 --- a/src/main/java/org/apache/ibatis/builder/xml/XMLIncludeTransformer.java +++ b/src/main/java/org/apache/ibatis/builder/xml/XMLIncludeTransformer.java @@ -81,7 +81,7 @@ private void applyIncludes(Node source, final Properties variablesContext, boole for (int i = 0; i < children.getLength(); i++) { applyIncludes(children.item(i), variablesContext, included); } - } else if (included && source.getNodeType() == Node.TEXT_NODE + } else if (included && (source.getNodeType() == Node.TEXT_NODE || source.getNodeType() == Node.CDATA_SECTION_NODE) && !variablesContext.isEmpty()) { // replace variables in text node source.setNodeValue(PropertyParser.parse(source.getNodeValue(), variablesContext)); diff --git a/src/test/java/org/apache/ibatis/submitted/include_property/Mapper.xml b/src/test/java/org/apache/ibatis/submitted/include_property/Mapper.xml index ae91c90c2c5..5d33b172a7e 100644 --- a/src/test/java/org/apache/ibatis/submitted/include_property/Mapper.xml +++ b/src/test/java/org/apache/ibatis/submitted/include_property/Mapper.xml @@ -1,7 +1,7 @@