X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-widget-ms%2Fwidget-ms%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fwidget%2Fservice%2Fimpl%2FWidgetCatalogServiceImpl.java;h=4554ab517d3a6bfccb37ec08d7ed35b6ab0853bd;hb=78c73d16d270ff182057fb797631a270d13c3740;hp=59180d37054ed254a24548c0dea424a08554e85d;hpb=3f56b9fdb4d2ec891344d6c9048363e1cac587d2;p=portal.git

diff --git a/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/service/impl/WidgetCatalogServiceImpl.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/service/impl/WidgetCatalogServiceImpl.java
index 59180d37..4554ab51 100644
--- a/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/service/impl/WidgetCatalogServiceImpl.java
+++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/service/impl/WidgetCatalogServiceImpl.java
@@ -156,6 +156,7 @@ public class WidgetCatalogServiceImpl implements WidgetCatalogService {
 	}
 	
 	@Override
+	@Transactional
 	public void deleteWidgetCatalog(long widgetCatalogId) {
 		logger.debug("WidgetCatalogServiceImpl.deleteWidgetCatalog: deleting the widget with widgetId={}", widgetCatalogId);
 		WidgetCatalog widget = getWidgetCatalog(widgetCatalogId);
@@ -164,7 +165,7 @@ public class WidgetCatalogServiceImpl implements WidgetCatalogService {
 			return;
 		}
 		Session session = sessionFactory.getCurrentSession();
-		Transaction tx = session.beginTransaction();
+		//Transaction tx = session.beginTransaction();
 		Query query = session.createSQLQuery("delete from ep_pers_user_widget_sel where widget_id = :widgetId ").setParameter("widgetId", widgetCatalogId);
 		query.executeUpdate();
 		query = session.createSQLQuery("delete from ep_pers_user_widget_placement where widget_id = :widgetId ").setParameter("widgetId", widgetCatalogId);
@@ -174,7 +175,7 @@ public class WidgetCatalogServiceImpl implements WidgetCatalogService {
 		query = session.createSQLQuery("delete from ep_widget_catalog_parameter where widget_id = :widgetId ").setParameter("widgetId", widgetCatalogId);
 		query.executeUpdate();
 		session.delete(widget);
-		tx.commit();
+		//tx.commit();
 	}
 	
 	@Override
@@ -191,7 +192,7 @@ public class WidgetCatalogServiceImpl implements WidgetCatalogService {
 			Transaction tx = session.beginTransaction();		
 			session.save(newWidgetCatalog);
 			tx.commit();
-			session.flush();
+			//session.flush();
 			session.close();
 			updateAppId(newWidgetCatalog.getId(), newWidgetCatalog.getWidgetRoles());
 		}
@@ -217,7 +218,7 @@ public class WidgetCatalogServiceImpl implements WidgetCatalogService {
 			Transaction tx = session.beginTransaction();
 			session.update(newWidgetCatalog);
 			tx.commit();
-			session.flush();
+			//session.flush();
 			session.close();
 			updateAppId(newWidgetCatalog.getId(), newWidgetCatalog.getWidgetRoles());
 		}catch(Exception e){
@@ -268,7 +269,7 @@ public class WidgetCatalogServiceImpl implements WidgetCatalogService {
 		
 		List<MicroserviceData> widgets = criteria.list();
 		logger.debug("WidgetCatalogServiceImpl.getWidgetIdByName: result={}", widgets);
-		session.flush();
+//		session.flush();
 		session.close();
 		
 		return (widgets.size() > 0) ? true : false;