Index: org/exolab/castor/util/Configuration.java =================================================================== --- org/exolab/castor/util/Configuration.java (Revision 6979) +++ org/exolab/castor/util/Configuration.java (Arbeitskopie) @@ -673,7 +673,7 @@ if (parser instanceof XMLReader) { XMLReader xmlReader = (XMLReader) parser; - setFeaturesOnXmlReader(features, validation, namespaces, xmlReader); + setFeaturesOnXmlReader(getDefault(), features, validation, namespaces, xmlReader); } return parser; @@ -686,15 +686,15 @@ * @param namespaces Whether to enable namespace support for not. * @param xmlReader The XMLReader instance to configure. */ - protected static void setFeaturesOnXmlReader(String features, + protected static void setFeaturesOnXmlReader(final Properties properties, + String features, final boolean validation, final boolean namespaces, final XMLReader xmlReader) { - StringTokenizer token; try { xmlReader.setFeature(Features.Validation, validation); xmlReader.setFeature(Features.Namespaces, namespaces); - features = getDefault().getProperty(Property.ParserFeatures, features); + features = properties.getProperty(Property.ParserFeatures, features); enableFeatures(features, xmlReader); String featuresToDisable = getDefault().getProperty(Property.ParserFeaturesToDisable, ""); disableFeatures(featuresToDisable, xmlReader); @@ -878,7 +878,7 @@ } StringTokenizer token; - setFeaturesOnXmlReader(features, validation, namespaces, reader); + setFeaturesOnXmlReader(getDefault(), features, validation, namespaces, reader); return reader; } //-- getDefaultXMLReader Index: org/exolab/castor/util/LocalConfiguration.java =================================================================== --- org/exolab/castor/util/LocalConfiguration.java (Revision 6979) +++ org/exolab/castor/util/LocalConfiguration.java (Arbeitskopie) @@ -286,7 +286,7 @@ * defaults * @return A suitable XML parser */ - public Parser getParser( String features ) + public Parser getParser(final String features) { String prop; Parser parser; @@ -345,7 +345,7 @@ if (parser instanceof XMLReader) { XMLReader xmlReader = (XMLReader) parser; - setFeaturesOnXmlReader(features, validation, namespaces, xmlReader); + setFeaturesOnXmlReader(getProperties(), features, validation, namespaces, xmlReader); } return parser; @@ -438,7 +438,7 @@ } } - setFeaturesOnXmlReader(features, validation, namespaces, reader); + setFeaturesOnXmlReader(getProperties(), features, validation, namespaces, reader); return reader;