Commented UserEventLog and corrected check of UserInfo

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@195024 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dashboard/ibase/dashboard/common/webService/DashboardService.java

@@ -52,6 +52,8 @@ public class DashboardService {
 		UserEventLogEJB userEventLogEJB=new UserEventLogEJB();
 		Date startTime=new Date();
 		String argParam="";
+		
+		if(userInfo != null ) {
 			userInfo.setSessionId( sessionId );
 			System.out.println("session id ");
 			System.out.println("user info:::::"+userInfo);
@@ -63,12 +65,12 @@ public class DashboardService {
 			System.out.println("Final File Path =" + dashboardMetadataFilePath);
 			DashboardUtil util = new DashboardUtil();
 			
-		userEventLogEJB.setEventLog(userInfo.getLoginCode(), dashboardFileName, sessionID,editorId,"Dashboard Metadata Retrive","Dashboard Metadata Retrive",  startTime, 
-				null,  argParam,"" ,  "Pending",  "Dashboard" ) ;
+			// Commented by Prajyot on 29-Dec-2018
+			//userEventLogEJB.setEventLog(userInfo.getLoginCode(), dashboardFileName, sessionID,editorId,"Dashboard Metadata Retrive","Dashboard Metadata Retrive",  startTime, 
+			//		null,  argParam,"" ,  "Pending",  "Dashboard" ) ;
 			System.out.println("Dashboard Service end set event log");
 			boolean fileCheck=false;
 			
-		if(userInfo != null ) {
 			String	userTranDB =userInfo.getTransDB();
 			if(userTranDB !=null) {
 				System.out.println("user trandb "+userTranDB);
@@ -92,14 +94,16 @@ public class DashboardService {
 				dashboardMetadata = util.getDashboardConfig(dashboardMetadataFilePath,userInfo);
 				dashboardMetadata.put("status","success" );
 			}
+			
+			// Commented by Prajyot on 29-Dec-2018
+			//userEventLogEJB.updateEventLog(userInfo.getLoginCode(), dashboardFileName, sessionID, editorId, "Dashboard Metadata Retrive" , "Dashboard Metadata Retrive", startTime,
+			//		new Date(),  argParam,"" , "Success","Dashboard");
 		}
 		else {
 			dashboardMetadata.put("status","failure" );
 			dashboardMetadata.put("message","Unauthorised access" );
 
 		}
-		userEventLogEJB.updateEventLog(userInfo.getLoginCode(), dashboardFileName, sessionID, editorId, "Dashboard Metadata Retrive" , "Dashboard Metadata Retrive", startTime,
-				new Date(),  argParam,"" , "Success","Dashboard");
 		System.out.println("Dashboard Service end update event log");
 		System.out.println("dashboard service final data "+dashboardMetadata.toString());
 		return dashboardMetadata.toString();