root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

avoid NPE in case of no "hibernateProperties" specified

This commit is contained in:
Juergen Hoeller 2011-10-11 01:10:07 +00:00
parent e1a6bb2d2e
commit 4c49cc73b2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java
View File

@ -152,7 +152,9 @@ public class LocalSessionFactoryBean implements FactoryBean<SessionFactory>, Res
config.getProperties().put(Environment.CURRENT_SESSION_CONTEXT_CLASS, SpringSessionContext.class.getName()); config.getProperties().put(Environment.CURRENT_SESSION_CONTEXT_CLASS, SpringSessionContext.class.getName());
config.getProperties().put(Environment.DATASOURCE, this.dataSource); config.getProperties().put(Environment.DATASOURCE, this.dataSource);
config.getProperties().put("hibernate.classLoader.application", this.resourcePatternResolver.getClassLoader()); config.getProperties().put("hibernate.classLoader.application", this.resourcePatternResolver.getClassLoader());
config.addProperties(this.hibernateProperties); if (this.hibernateProperties != null) {
config.addProperties(this.hibernateProperties);
}
scanPackages(config); scanPackages(config);
for (Class<?> annotatedClass : this.annotatedClasses) { for (Class<?> annotatedClass : this.annotatedClasses) {
ReflectionUtils.invokeMethod(addAnnotatedClassMethod, config, annotatedClass); ReflectionUtils.invokeMethod(addAnnotatedClassMethod, config, annotatedClass);