Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed validating to be true by default and to set namespaceAware accordingly

Browse Source
This commit is contained in:
Juergen Hoeller
2009-11-12 02:36:53 +00:00
parent e52e4c5717
commit 6ef9c2d710
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
org.springframework.context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java
View File

@@ -44,7 +44,7 @@ import org.springframework.core.io.Resource;
*/
public abstract class AbstractXmlApplicationContext extends AbstractRefreshableConfigApplicationContext {
private boolean validating = false;
private boolean validating = true;
/**
@@ -101,9 +101,10 @@ public abstract class AbstractXmlApplicationContext extends AbstractRefreshableC
* @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader#setDocumentReaderClass
*/
protected void initBeanDefinitionReader(XmlBeanDefinitionReader beanDefinitionReader) {
beanDefinitionReader.setValidationMode(this.validating ?
XmlBeanDefinitionReader.VALIDATION_AUTO : XmlBeanDefinitionReader.VALIDATION_NONE);
if (!this.validating) {
beanDefinitionReader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE);
beanDefinitionReader.setNamespaceAware(true);
}
}
/**

1
org.springframework.context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java
View File

@@ -74,6 +74,7 @@ public class GenericXmlApplicationContext extends GenericApplicationContext {
public void setValidating(boolean validating) {
this.reader.setValidationMode(validating ?
XmlBeanDefinitionReader.VALIDATION_AUTO : XmlBeanDefinitionReader.VALIDATION_NONE);
this.reader.setNamespaceAware(!validating);
}