From 4c49cc73b28e89599ae95c0dbd5b099b164bba01 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Tue, 11 Oct 2011 01:10:07 +0000
Subject: [PATCH] avoid NPE in case of no "hibernateProperties" specified

---
 .../orm/hibernate4/LocalSessionFactoryBean.java               | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java b/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java
index 083a5661951..286b69b68c6 100644
--- a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java
+++ b/org.springframework.orm/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java
@@ -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.DATASOURCE, this.dataSource);
 		config.getProperties().put("hibernate.classLoader.application", this.resourcePatternResolver.getClassLoader());
-		config.addProperties(this.hibernateProperties);
+		if (this.hibernateProperties != null) {
+			config.addProperties(this.hibernateProperties);
+		}
 		scanPackages(config);
 		for (Class<?> annotatedClass : this.annotatedClasses) {
 			ReflectionUtils.invokeMethod(addAnnotatedClassMethod, config, annotatedClass);