1 files changed, 19 insertions, 7 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java
index b1e02fbc..152db54e 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java
@@ -748,21 +748,20 @@ public class ActionHandler extends org.onap.portalsdk.analytics.RaptorObject {
 								rr.logReportExecutionTime(userId, String.valueOf(totalTime),
 										AppConstants.RLA_EXECUTION_TIME, formFields);
 	  							 
-	  							 if(rd!=null && !action.equals("report.run.container"))
-	  							rr.logReportExecutionTime(userId, String.valueOf(totalTime),AppConstants.RLA_EXECUTION_TIME, formFields);
 	  						 }
 						}
 					} else {
-						rr.logReportExecutionTimeFromLogList(userId, String.valueOf(totalTime),formFields);					
+					rr.logReportExecutionTimeFromLogList(userId, String.valueOf(totalTime), "");
 					}
-					
 					if(rr.isDrillDownURLInPopupPresent())  {
 						request.getSession().setAttribute(PARENT+rr.getReportID()+"_rr", rr);
 						request.getSession().setAttribute(PARENT+rr.getReportID()+"_rd", rd);
 					}
 					
 					if(rr.getReportType().equals(AppConstants.RT_CROSSTAB)) {
-						return "raptor/report_crosstab_run_container.jsp"; 
+						ObjectMapper mapper = new ObjectMapper();
+						mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+						mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 					} else if (rr.getReportType().equals(AppConstants.RT_HIVE) && !isEmailAttachment) {
 						return "raptor/report_hive_run_container.jsp";
 					}
@@ -796,8 +795,13 @@ public class ActionHandler extends org.onap.portalsdk.analytics.RaptorObject {
 				request.getSession().setAttribute(AppConstants.EMBEDDED_REPORTDATA_MAP, embeddedReportsDataMap);
 
 			}
-			
-			ReportJSONRuntime reportJSONRuntime = rr.createReportJSONRuntime(request, rd);
+			ReportJSONRuntime reportJSONRuntime = new ReportJSONRuntime();
+
+			if(rr.getReportType().equals(AppConstants.RT_CROSSTAB)) {
+				reportJSONRuntime = rr.createCrossTabReportJSONRuntime(request, rd);
+			} else {
+				reportJSONRuntime = rr.createReportJSONRuntime(request, rd);
+			}  
 			Set<String> keys = rr.getReportParamValues().keySet();
 			String ffValue = "";
 			for (String key : keys) {
@@ -966,7 +970,15 @@ public class ActionHandler extends org.onap.portalsdk.analytics.RaptorObject {
 	} // reportSearchFavorites
 
 	public String reportSearchExecute(HttpServletRequest request, String nextPage) {
+		String str = request.getParameter("fromEdit");
+		if(str != null && !str.equalsIgnoreCase("null")) {		
+		if(!str.equalsIgnoreCase("true")) {
+		  removeVariablesFromSession(request);	
+		  }
+		}else {
 		removeVariablesFromSession(request);		
+		}
+		
 		try {
 			SearchHandler sh = new SearchHandler();
 			ReportSearchResultJSON sr = sh.loadReportSearchResult(request);