From e81b7ee0258a74effcfba1f32fc9a141e717dd58 Mon Sep 17 00:00:00 2001
From: sunqi310 <sun.qi310@zte.com.cn>
Date: Tue, 18 Oct 2016 09:30:07 +0800
Subject: [PATCH] TOSCA-121 Modify the problem of session closed when
 appincation access the same database table at the same time

Change-Id: Ic9f8720339858eed7cf9b71e32255ab334e94a94
Issue-id: TOSCA-121
Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
---
 .../openo/commontosca/catalog/db/dao/DaoManager.java | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/db/dao/DaoManager.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/db/dao/DaoManager.java
index 685ffdff..c7d2cc1a 100644
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/db/dao/DaoManager.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/db/dao/DaoManager.java
@@ -74,9 +74,9 @@ public class DaoManager {
    * @return ServiceTemplateDao
    */
   public ServiceTemplateDao getServiceTemplateDao() {
-    if (serviceTemplateDao == null) {
+    //if (serviceTemplateDao == null) {
       serviceTemplateDao = new ServiceTemplateDao(sessionFactory);
-    }
+   // }
     return serviceTemplateDao;
   }
 
@@ -89,9 +89,9 @@ public class DaoManager {
    * @return PackageDao
    */
   public PackageDao getPackageDao() {
-    if (packageDao == null) {
+   // if (packageDao == null) {
       packageDao = new PackageDao(sessionFactory);
-    }
+   // }
     return packageDao;
   }
 
@@ -104,9 +104,9 @@ public class DaoManager {
    * @return NodeTemplateDao
    */
   public NodeTemplateDao getNodeTemplateDao() {
-    if (nodeTemplateDao == null) {
+   // if (nodeTemplateDao == null) {
       nodeTemplateDao = new NodeTemplateDao(sessionFactory);
-    }
+   // }
     return nodeTemplateDao;
   }
 
@@ -119,9 +119,9 @@ public class DaoManager {
    * @return TemplateDao
    */
   public TemplateDao getTemplateDao() {
-    if (templateDao == null) {
+   // if (templateDao == null) {
       templateDao = new TemplateDao(sessionFactory);
-    }
+   // }
     return templateDao;
   }
 
@@ -134,9 +134,9 @@ public class DaoManager {
    * @return ServiceTemplateMappingDao
    */
   public ServiceTemplateMappingDao getTemplateMappingDao() {
-    if (templateMappingDao == null) {
+    //if (templateMappingDao == null) {
       templateMappingDao = new ServiceTemplateMappingDao(sessionFactory);
-    }
+   // }
     return templateMappingDao;
   }
 
-- 
2.16.6