Merge pull request #163 from kazuki43zoo/defensive-null

Add null-check for configurationProperty on SqlSessionFactoryBean

Author: kazuki43zoo

src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java

@@ -410,7 +410,9 @@ protected SqlSessionFactory buildSqlSessionFactory() throws IOException {
         LOGGER.debug("Property `configuration` or 'configLocation' not specified, using default MyBatis Configuration");
       }
       configuration = new Configuration();
-      configuration.setVariables(this.configurationProperties);
+      if (this.configurationProperties != null) {
+        configuration.setVariables(this.configurationProperties);
+      }
     }
 
     if (this.objectFactory != null) {

src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java

@@ -406,6 +406,7 @@ public void testAddCache() {
   private void assertDefaultConfig(SqlSessionFactory factory) {
     assertConfig(factory, SqlSessionFactoryBean.class.getSimpleName(),
         org.mybatis.spring.transaction.SpringManagedTransactionFactory.class);
+    assertEquals(0, factory.getConfiguration().getVariables().size());
   }
 
   private void assertConfig(SqlSessionFactory factory, Class<? extends TransactionFactory> transactionFactoryClass) {