added again externalTemplate, it is used to give priority to template if both sqlsessionfactory and template are set

Author: emacarron

src/main/java/org/mybatis/spring/support/SqlSessionDaoSupport.java

@@ -57,18 +57,23 @@ public abstract class SqlSessionDaoSupport extends DaoSupport {
 
     private SqlSessionTemplate sqlSessionTemplate;
 
+    private boolean externalTemplate;
+
     @Autowired(required = false)
     public final void setSqlSessionFactory(SqlSessionFactory sqlSessionFactory) {
-        this.sqlSessionTemplate = new SqlSessionTemplate(sqlSessionFactory);
+        if (!this.externalTemplate) {
+            this.sqlSessionTemplate = new SqlSessionTemplate(sqlSessionFactory);
+        }
     }
-
+    
     public final SqlSessionFactory getSqlSessionFactory() {
         return this.sqlSessionTemplate.getSqlSessionFactory();
     }
 
     @Autowired(required = false)
     public final void setSqlSessionTemplate(SqlSessionTemplate sqlSessionTemplate) {
         this.sqlSessionTemplate = sqlSessionTemplate;
+        this.externalTemplate = true;
     }
 
     public final SqlSessionTemplate getSqlSessionTemplate() {