resultset and prepared statement closed

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

webitm-dashboard/ibase/dashboard/sfa/ejb/AdminPlan.java

@@ -122,8 +122,10 @@ public class AdminPlan extends ValidatorEJB implements AdminPlanLocal,AdminPlanR
 		        rawDataAdminPlanDtlJson.put(count, rowData);
 		        count++;
 			}
-			rs    = null;
-			pstmt = null;
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 			
 			System.out.println("rawDataPlanDtlJson :"+rawDataAdminPlanDtlJson);
 			
@@ -304,8 +306,10 @@ public class AdminPlan extends ValidatorEJB implements AdminPlanLocal,AdminPlanR
 					salPersMap.put(salesPersCode, spStatDetailList);
 				}
 			}
-			rs    = null;
-			pstmt = null;
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 			
 			for (Map.Entry<String, ArrayList<HashMap<String, String>>> entry : salPersMap.entrySet()) {
 				salesPersCode = entry.getKey();
@@ -501,8 +505,10 @@ public class AdminPlan extends ValidatorEJB implements AdminPlanLocal,AdminPlanR
 					salPersMap.put(salesPersCode, spStatDetailList);
 				}
 			}
-			rs    = null;
-			pstmt = null;
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 			
 			for (Map.Entry<String, ArrayList<HashMap<String, String>>> entry : salPersMap.entrySet()) {
 				salesPersCode = entry.getKey();

webitm-dashboard/ibase/dashboard/sfa/ejb/AllIndiaQTQ.java

@@ -332,6 +332,10 @@ public class AllIndiaQTQ extends ValidatorEJB implements AllIndiaQTQLocal,AllInd
 		rowDataAllIndiaQTQJson.put(count, rowData);
 		count++;
 		
+		rs.close();
+		rs=null;
+		pstmt.close();
+		pstmt=null;
 		
 	   }//closed the if block	
 		System.out.println(" rowDataAllIndiaQTQJson is =" + rowDataAllIndiaQTQJson);

webitm-dashboard/ibase/dashboard/sfa/ejb/AttendanceCompliance.java

@@ -107,7 +107,7 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp
 	
 	/*Final SQL After E.STATUS ='Y' changes in SQL  On dated 050516*/
 	
-	sql =   " SELECT A.SALES_PERS, SP.SP_NAME, A.LAST_REPORT, ROUND(TRUNC(sysdate)-TRUNC(A.LAST_REPORT)) NOT_REPORTED_DAYS," +
+			sql =   " SELECT A.SALES_PERS, SP.SP_NAME, A.LAST_REPORT, ROUND(TRUNC(sysdate)-TRUNC(A.LAST_REPORT)) NOT_REPORTED_DAYS," +
 			" I.DESCR DIVISION , E.HOBBY1 REGION, S.DESCR STATE, (NVL(TRIM(E1.EMP_FNAME),'') ||NVL(TRIM(E1.EMP_MNAME),' ') ||NVL(TRIM(E1.EMP_LNAME),'')) EMP_NAME, " +
 			" E.MOBILE_NO FROM (SELECT t.SALES_PERS, MAX(T.EVENT_DATE) LAST_REPORT " +
 			" FROM SPRS_ACT_TRAN T " +
@@ -124,35 +124,39 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp
 			" LEFT OUTER JOIN STATE S ON S.STATE_CODE = E.CUR_STATE ";
 
 	
-	System.out.println("sql is =" + sql);
-	pstmt = conn.prepareStatement(sql);
-	rs = pstmt.executeQuery();
+			System.out.println("sql is =" + sql);
+			pstmt = conn.prepareStatement(sql);
+			rs = pstmt.executeQuery();
 
-	while (rs.next())
-	{
-
-		rowData = new JSONObject();
-		rowData.put("salespersn",   checkNull(rs.getString("SALES_PERS")));
-		rowData.put("spname",       checkNull(rs.getString("SP_NAME")));
-		String dueDate             =checkNull(rs.getString("LAST_REPORT"));
-		if(dueDate.trim().length()>0)
-        {
-            rowData.put("lastreport", simpleDateFormat.format(convertToDbDate.parse(dueDate)));
-        }
-        else
-        {
-            rowData.put("lastreport",checkNull (rs.getString("LAST_REPORT")));
-        }
+			while (rs.next())
+			{
 		
-		rowData.put("notreporteddays",  checkNull(rs.getString("NOT_REPORTED_DAYS")));
-		rowData.put("division",         checkNull(rs.getString("DIVISION")));
-		rowData.put("region",           checkNull(rs.getString("REGION")));
-		rowData.put("state",            checkNull(rs.getString("STATE")));
-		rowData.put("empname",          checkNull(rs.getString("EMP_NAME")));
-		rowData.put("mobileno",         checkNull(rs.getString("MOBILE_NO")));
-		rowDataPendingTaskJson.put(Integer.valueOf(count), rowData);
-		count++;
+				rowData = new JSONObject();
+				rowData.put("salespersn",   checkNull(rs.getString("SALES_PERS")));
+				rowData.put("spname",       checkNull(rs.getString("SP_NAME")));
+				String dueDate             =checkNull(rs.getString("LAST_REPORT"));
+				if(dueDate.trim().length()>0)
+		        {
+		            rowData.put("lastreport", simpleDateFormat.format(convertToDbDate.parse(dueDate)));
+		        }
+		        else
+		        {
+		            rowData.put("lastreport",checkNull (rs.getString("LAST_REPORT")));
+		        }
+				
+				rowData.put("notreporteddays",  checkNull(rs.getString("NOT_REPORTED_DAYS")));
+				rowData.put("division",         checkNull(rs.getString("DIVISION")));
+				rowData.put("region",           checkNull(rs.getString("REGION")));
+				rowData.put("state",            checkNull(rs.getString("STATE")));
+				rowData.put("empname",          checkNull(rs.getString("EMP_NAME")));
+				rowData.put("mobileno",         checkNull(rs.getString("MOBILE_NO")));
+				rowDataPendingTaskJson.put(Integer.valueOf(count), rowData);
+				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 			System.out.println(" rowDataPendingTaskJson is =" + rowDataPendingTaskJson);
 
 		}

webitm-dashboard/ibase/dashboard/sfa/ejb/Compliance.java

@@ -89,6 +89,10 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia
 				rawDataComplianceDtlJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{
@@ -163,6 +167,10 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia
 				rawDataComplianceCustDtlJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)/* sql = " Select FHCODE , FHNAME, FHDESG, NSMCODE, NSMNAME, NSMDESG, SMCODE," +
 		" SMNAME, SMDESG, RSECODE, RSENAME, RSEDESG, REPCODE, " +
@@ -269,6 +277,10 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia
 				rawDataComplianceGridJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{
@@ -379,7 +391,10 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia
 					rawDataComplianceSummJson.put(count, rowData);
 					count++;
 				}
-			  
+				rs.close();
+				rs=null;
+				pstmt.close();
+				pstmt=null;
 			}
 			catch (Exception e)
 			{
@@ -493,6 +508,10 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia
 					rawDataComplianceDetJson.put(count, rowData);
 					count++;
 				}
+				rs.close();
+				rs=null;
+				pstmt.close();
+				pstmt=null;
 			}
 			catch (Exception e)
 			{
@@ -559,16 +578,16 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia
 				
 			    //Add code of MTD for default on loading case
 				
-							if((fromDate==null) ||(fromDate.equals("")) && (toDate==null) || (toDate.equals("")))
-							{ 				
-							   
-								  convertToDBDate = new SimpleDateFormat(genericUtility.getApplDateFormat());
-								  calendar = Calendar.getInstance();
-								  calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMinimum(Calendar.DAY_OF_MONTH));
-								  fromDate  = convertToDBDate.format(calendar.getTime());
-								  toDate    = convertToDBDate.format(Calendar.getInstance().getTime());
-								  System.out.println("frmDate ====" + fromDate+" toDate==="+toDate);				
-							  }
+				if((fromDate==null) ||(fromDate.equals("")) && (toDate==null) || (toDate.equals("")))
+				{ 				
+				   
+					  convertToDBDate = new SimpleDateFormat(genericUtility.getApplDateFormat());
+					  calendar = Calendar.getInstance();
+					  calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMinimum(Calendar.DAY_OF_MONTH));
+					  fromDate  = convertToDBDate.format(calendar.getTime());
+					  toDate    = convertToDBDate.format(Calendar.getInstance().getTime());
+					  System.out.println("frmDate ====" + fromDate+" toDate==="+toDate);				
+				  }
 						  	 
 				//End the code of MTD format
 				
@@ -587,6 +606,10 @@ public class Compliance extends ValidatorEJB implements ComplianceLocal, Complia
 					rawDataCompliancePerDetJson.put(count, rowData);
 					count++;
 				}
+				rs.close();
+				rs=null;
+				pstmt.close();
+				pstmt=null;
 			}
 			catch (Exception e)
 			{

webitm-dashboard/ibase/dashboard/sfa/ejb/Compliance_Nova.java

@@ -128,6 +128,10 @@ public class Compliance_Nova extends ValidatorEJB implements Compliance_NovaLoca
 				rawDataComplianceDtlJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{
@@ -202,6 +206,10 @@ public class Compliance_Nova extends ValidatorEJB implements Compliance_NovaLoca
 				rawDataComplianceCustDtlJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{
@@ -326,6 +334,10 @@ public class Compliance_Nova extends ValidatorEJB implements Compliance_NovaLoca
 				rawDataComplianceGridJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{

webitm-dashboard/ibase/dashboard/sfa/ejb/CurrentDayWrkSummary.java

@@ -130,9 +130,11 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
 					
 				rawDataEmployeeProdSurveylJson.put(count, rowData);
 				count++;
-				
-				
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{
@@ -294,9 +296,11 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
 				rowData.put("To_Calls",checkNull( rs.getString("To_Calls")));
 				rawDataCurrentDayWrkSumDtlJson.put(count, rowData);
 				count++;
-				
-				
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{
@@ -408,9 +412,11 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
 				
 				rawDataCurrentDayWrkSumDtlJson.put(count, rowData);
 				count++;
-				
-				
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{
@@ -610,9 +616,11 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
 				
 				rawDataCurrentDayWrkSKUDtlJson.put(count, rowData);
 				count++;
-				
-				
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{
@@ -752,6 +760,10 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
 				rawDataMTDWorkParentJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{
@@ -873,7 +885,6 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
 			pstmt = conn.prepareStatement(sql);
 			rs = pstmt.executeQuery();
 
-			
 			while (rs.next())
 			{
 				rowData = new JSONObject();
@@ -914,6 +925,10 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
 				rawDataMTDWorkParentJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{
@@ -1032,6 +1047,10 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
 				rawDataMTDWorkDtlParentJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{
@@ -1216,6 +1235,10 @@ public class CurrentDayWrkSummary extends ValidatorEJB implements CurrentDayWrkS
 				rawDataMTDWorkDtlJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{

webitm-dashboard/ibase/dashboard/sfa/ejb/CustomerMeetingTrends.java

@@ -82,10 +82,10 @@ public class CustomerMeetingTrends extends ValidatorEJB implements CustomerMeeti
 				
 			}
 			
-			pstmt.close();
-			pstmt = null;
 			rs.close();
-			rs = null;
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 			
 			/** XML String for year-week **/
 

webitm-dashboard/ibase/dashboard/sfa/ejb/DoctorsMeetingByClass.java

@@ -83,10 +83,10 @@ public class DoctorsMeetingByClass extends ValidatorEJB implements DoctorsMeetin
 			}
 			xmlData.append("</Root>");
 			System.out.println("XML DATA is= >"+xmlData);
-			pstmt.close();
-			pstmt = null;
 			rs.close();
-			rs = null;
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 
 		} catch (Exception e)
 		{

webitm-dashboard/ibase/dashboard/sfa/ejb/DoctorsVisit.java

@@ -257,7 +257,10 @@ public class DoctorsVisit extends ValidatorEJB implements DoctorsVisitRemote, Do
 				System.out.println("salesperson_name--->["+rs.getString("salesperson_name")+"]" + "count--->["+count+"]");	
 				count++;
 			}
-			
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{

webitm-dashboard/ibase/dashboard/sfa/ejb/ExpenseProcessStatus.java

@@ -94,10 +94,10 @@ public class ExpenseProcessStatus extends ValidatorEJB implements ExpenseProcess
 			}
 
 			xmlData.append("</Root>");
-			pstmt.close();
-			pstmt = null;
 			rs.close();
-			rs = null;
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 
 		} catch (Exception e)
 		{

webitm-dashboard/ibase/dashboard/sfa/ejb/ImpDocMissed.java

@@ -77,10 +77,10 @@ public class ImpDocMissed extends ValidatorEJB implements ImpDocMissedRemote, Im
 				xmlData.append("</Detail>");
 			}
 			xmlData.append("</Root>");
-			pstmt.close();
-			pstmt = null;
 			rs.close();
-			rs = null;
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		} catch (Exception e)
 		{
 			e.printStackTrace();

webitm-dashboard/ibase/dashboard/sfa/ejb/ImpEvents.java

@@ -61,10 +61,10 @@ public class ImpEvents  extends ValidatorEJB implements ImpEventsRemote, ImpEven
 					xmlData.append("</Detail1>");
 				}
 				
-				pstmt.close();
-				pstmt = null;
 				rs.close();
-				rs = null;
+				rs=null;
+				pstmt.close();
+				pstmt=null;
 				
 				sql="select STRG_EVENTS.EVENT_DATE as Event_Date, STRG_CUSTOMER.SC_CODE, INITCAP(strg_customer.first_name||' '||strg_customer.middle_name||' '||strg_customer.last_name )AS DrName, LISTAGG(STRG_EVENTS.DESCR, ', ') WITHIN GROUP (ORDER BY STRG_EVENTS.DESCR) as Event FROM SALES_PERS INNER JOIN STRG_SERIES on STRG_SERIES.SALES_PERS = SALES_PERS.SALES_PERS and STRG_SERIES.Cust_Type = 'D' and STRG_SERIES.Status = 'Y' INNER JOIN STRG_CUSTOMER ON STRG_CUSTOMER.SC_CODE = STRG_SERIES.SC_CODE INNER JOIN STRG_EVENTS ON STRG_CUSTOMER.SC_CODE = STRG_EVENTS.SC_CODE WHERE SALES_PERS.SALES_PERS = ?  AND STRG_EVENTS.EVENT_DATE  = TO_DATE(sysdate,'dd/mm/yy HH24:MI:SS') + 1 group by STRG_EVENTS.EVENT_DATE , STRG_CUSTOMER.SC_CODE, strg_customer.first_name, strg_customer.middle_name, strg_customer.last_name";
 				
@@ -79,10 +79,10 @@ public class ImpEvents  extends ValidatorEJB implements ImpEventsRemote, ImpEven
 					xmlData.append("</Detail2>");
 				}
 				
-				pstmt.close();
-				pstmt = null;
 				rs.close();
-				rs = null;
+				rs=null;
+				pstmt.close();
+				pstmt=null;
 				
 				sql="select STRG_EVENTS.EVENT_DATE as Event_Date, STRG_CUSTOMER.SC_CODE, INITCAP(strg_customer.first_name||' '||strg_customer.middle_name||' '||strg_customer.last_name )AS DrName, LISTAGG(STRG_EVENTS.DESCR, ', ') WITHIN GROUP (ORDER BY STRG_EVENTS.DESCR) as Event FROM SALES_PERS INNER JOIN STRG_SERIES on STRG_SERIES.SALES_PERS = SALES_PERS.SALES_PERS and STRG_SERIES.Cust_Type = 'D' and STRG_SERIES.Status = 'Y' INNER JOIN STRG_CUSTOMER ON STRG_CUSTOMER.SC_CODE = STRG_SERIES.SC_CODE INNER JOIN STRG_EVENTS ON STRG_CUSTOMER.SC_CODE = STRG_EVENTS.SC_CODE WHERE SALES_PERS.SALES_PERS = ? AND STRG_EVENTS.EVENT_DATE >= TO_DATE(sysdate,'dd/mm/yy HH24:MI:SS')+2 AND STRG_EVENTS.EVENT_DATE <= TO_DATE(sysdate,'dd/mm/yy HH24:MI:SS')+8 group by STRG_EVENTS.EVENT_DATE, STRG_CUSTOMER.SC_CODE, strg_customer.first_name, strg_customer.middle_name, strg_customer.last_name"; 
 				
@@ -97,10 +97,10 @@ public class ImpEvents  extends ValidatorEJB implements ImpEventsRemote, ImpEven
 					xmlData.append("<event_date >").append("<![CDATA[" + rs.getDate("Event_Date") + "]]>").append("</event_date>");
 					xmlData.append("</Detail3>");
 				}
-				pstmt.close();
-				pstmt = null;
 				rs.close();
-				rs = null;
+				rs=null;
+				pstmt.close();
+				pstmt=null;
 				xmlData.append("</Root>");
 			
 		} catch (Exception e)

webitm-dashboard/ibase/dashboard/sfa/ejb/LiveEventDetails.java

@@ -63,6 +63,10 @@ public class LiveEventDetails extends ValidatorEJB implements LiveEventDetailsLo
 				rawDataActiveEventlJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{
@@ -138,9 +142,6 @@ public class LiveEventDetails extends ValidatorEJB implements LiveEventDetailsLo
 				  /*"GROUP BY emp.code, emp.firstname +' '+ emp.lastname, sca.scope_code,srd.result,srd.TRAN_ID  */") b " +
 				  "group by code, PARTICIPANTS_NAME ) a ORDER BY rank ";
 				
-				
-				
-				
 			pstmt     = conn.prepareStatement(sql);
 			rs        = pstmt.executeQuery();
 			int count = 0;				
@@ -155,6 +156,10 @@ public class LiveEventDetails extends ValidatorEJB implements LiveEventDetailsLo
 				rawDataParticipentEventSummaryJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		  }
 		}			
 		catch (Exception  e)
@@ -221,10 +226,7 @@ public class LiveEventDetails extends ValidatorEJB implements LiveEventDetailsLo
 				"WHERE e.code='"+participentCode+"' " +
 				"GROUP BY e.ZONECODE, r.Name, e.teamcode, e.code, SUR.MGR, emp.FIRSTNAME, (e.FIRSTNAME +' '+ e.LASTNAME) ) SELECT * FROM as_det";
 		
-		
-		
-		
-	            pstmt = conn.prepareStatement(sql);
+				pstmt = conn.prepareStatement(sql);
 				rs    = pstmt.executeQuery();
 				int count = 0;	
 			    while (rs.next())
@@ -238,8 +240,11 @@ public class LiveEventDetails extends ValidatorEJB implements LiveEventDetailsLo
 					rowData.put("name", checkNull(rs.getString("NAME")));				
 					rawDataParticipentEventDetailJson.put(count, rowData);
 					count++;
-			    	
-			}
+			    }
+			    rs.close();
+				rs=null;
+				pstmt.close();
+				pstmt=null;
 		  }
  	}//closed if block	
 	catch (Exception e)
@@ -409,6 +414,10 @@ public class LiveEventDetails extends ValidatorEJB implements LiveEventDetailsLo
 		        rawDataParticipentProductDetailJson.put(Integer.valueOf(count), rowData);
 		        count++;
 			}
+			    rs.close();
+				rs=null;
+				pstmt.close();
+				pstmt=null;
 		  }
  	}//closed if block	
 	catch (Exception e)
@@ -518,6 +527,10 @@ public class LiveEventDetails extends ValidatorEJB implements LiveEventDetailsLo
 				rawDataProductDetailJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 	
 		}		

webitm-dashboard/ibase/dashboard/sfa/ejb/LiveEventMgrWiseDetails.java

@@ -91,6 +91,10 @@ public class LiveEventMgrWiseDetails extends ValidatorEJB implements LiveEventMg
 				rawDataActiveEventlJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{
@@ -176,6 +180,10 @@ public class LiveEventMgrWiseDetails extends ValidatorEJB implements LiveEventMg
 						rawDataParticipentEventSummaryJson.put(count, rowData);
 						count++;
 					}
+					rs.close();
+					rs=null;
+					pstmt.close();
+					pstmt=null;
 		}			
 		catch (Exception  e)
 		{
@@ -265,7 +273,11 @@ public class LiveEventMgrWiseDetails extends ValidatorEJB implements LiveEventMg
 						rowData.put("nos", checkNull(rs.getString("NOS")));
 						rawDataParticipentEventDetailJson.put(count, rowData);
 						count++;
-			}
+				     }
+				    rs.close();
+					rs=null;
+					pstmt.close();
+					pstmt=null;
 		}
  	}//closed if block	
 	catch (Exception e)
@@ -399,6 +411,10 @@ public class LiveEventMgrWiseDetails extends ValidatorEJB implements LiveEventMg
 				        rawDataParticipentProductDetailJson.put(Integer.valueOf(count), rowData);
 				        count++;
 					}
+				    rs.close();
+					rs=null;
+					pstmt.close();
+					pstmt=null;
 			  }
 	 	}
 		catch (Exception e)
@@ -483,6 +499,10 @@ public class LiveEventMgrWiseDetails extends ValidatorEJB implements LiveEventMg
 					rawDataProductDetailJson.put(count, rowData);
 					count++;
 				}
+				rs.close();
+				rs=null;
+				pstmt.close();
+				pstmt=null;
 			}
 	
 		}		

webitm-dashboard/ibase/dashboard/sfa/ejb/OutletsVisitEJB.java

@@ -612,6 +612,10 @@ public class OutletsVisitEJB extends ValidatorEJB implements OutletsVisitRemote,
 				rawDataMnthDivWiseSalesJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{

webitm-dashboard/ibase/dashboard/sfa/ejb/PendingStatus.java

@@ -149,6 +149,10 @@ PendingStatusRemote
 		rowDataPendingTaskJson.put(Integer.valueOf(count), rowData);
 		count++;
 	}
+	rs.close();
+	rs=null;
+	pstmt.close();
+	pstmt=null;
 			System.out.println(" rowDataPendingTaskJson is =" + rowDataPendingTaskJson);
 
 		}

webitm-dashboard/ibase/dashboard/sfa/ejb/PlanVsActual.java

@@ -109,8 +109,10 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
 					
 				}
 			}
-			rs = null;
-			pstmt =null;
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 			System.out.println(" Planned doctors visited finalMap :"+finalMap);
 			
 			docList = new ArrayList<String>();
@@ -152,8 +154,10 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
 			}
 			System.out.println(" Planned doctors not visited :"+finalMap);
 			
-			rs = null;
-			pstmt =null;
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 			docList = new ArrayList<String>();
 			
 			/*----------Unplanned doctors visited----Unplanned--------*/
@@ -193,8 +197,10 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
 				}
 			}
 			System.out.println(" Unplanned doctors visited hashMap :"+finalMap);
-			rs = null;
-			pstmt =null;
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 			int count = 0;
 			for (Map.Entry<String, HashMap<String, ArrayList<String>>> entry : finalMap.entrySet())
 			{
@@ -391,8 +397,10 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
 				count++;
 				
 			}*/
-			rs = null;
-			pstmt =null;
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 			
 	    } 
 		catch (Exception e) 
@@ -474,8 +482,10 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
 				strg_code = strg_code == null ? "" : strg_code.trim();
 				strgCodeList.add(strg_code);
 			}
-			rs = null;
-			pstmt =null;
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		} catch (Exception e) 
 		{
 			e.printStackTrace();

webitm-dashboard/ibase/dashboard/sfa/ejb/PlannedVSActualActionTypes.java

@@ -65,7 +65,10 @@ public class PlannedVSActualActionTypes implements PlannedVSActualActionTypesRem
 						
 					this.setSalesPerson(rs.getString("sp_name"));
 					}
-			
+					rs.close();
+					rs=null;
+					pstmt.close();
+					pstmt=null;
 			
 				sql = "select INITCAP(trim(strg_customer.first_name)||''|| (CASE WHEN trim(strg_customer.middle_name) IS NULL THEN '' ELSE (' '||strg_customer.middle_name) END ) ||' ' ||trim(strg_customer.last_name) )AS DrName from sprs_plan, strg_customer where sprs_plan.plan_status = 'P' AND STRG_CUSTOMER.CUST_TYPE = 'D' AND  sprs_plan.strg_code = strg_customer.sc_code and sprs_plan.sprs_code__plan = ? and sprs_plan.plan_date = to_char(sysdate) minus select INITCAP(trim(strg_customer.first_name)||''|| (CASE WHEN trim(strg_customer.middle_name) IS NULL THEN '' ELSE (' '||strg_customer.middle_name) END ) ||' ' ||trim(strg_customer.last_name) )AS DrName from sprs_plan,strg_meet, strg_customer where sprs_plan.plan_status = 'P' AND STRG_CUSTOMER.CUST_TYPE = 'D' AND sprs_plan.plan_date = strg_meet.event_date AND sprs_plan.strg_code = strg_customer.sc_code AND SPRS_PLAN.STRG_CODE = STRG_MEET.STRG_CODE AND sprs_plan.sprs_code__plan = STRG_MEET.SALES_PERS and sprs_plan.sprs_code__plan = ? and sprs_plan.plan_date = to_char(sysdate) order by 1 ";
 				
@@ -78,12 +81,10 @@ public class PlannedVSActualActionTypes implements PlannedVSActualActionTypesRem
 				{
 					xmlData.append("<dr_not_visited>").append("<![CDATA[" +checkNull(rs.getString("DrName"))+ "]]>").append("</dr_not_visited>");
 				}
-				
-				pstmt.close();
-				pstmt = null;
 				rs.close();
-				rs = null;
-				
+				rs=null;
+				pstmt.close();
+				pstmt=null;
 				
 				sql="select INITCAP(trim(strg_customer.first_name)||''|| (CASE WHEN trim(strg_customer.middle_name) IS NULL THEN '' ELSE (' '||strg_customer.middle_name) END ) ||' ' ||trim(strg_customer.last_name) )AS DrName from sprs_plan,strg_meet, strg_customer where sprs_plan.plan_status = 'P' AND STRG_CUSTOMER.CUST_TYPE = 'D' AND sprs_plan.plan_date = strg_meet.event_date AND sprs_plan.strg_code = strg_customer.sc_code AND SPRS_PLAN.STRG_CODE = STRG_MEET.STRG_CODE AND sprs_plan.sprs_code__plan = STRG_MEET.SALES_PERS and sprs_plan.sprs_code__plan = ? and sprs_plan.plan_date = to_char(sysdate) order by INITCAP(strg_customer.first_name||' '||strg_customer.middle_name||' '||strg_customer.last_name )"; 
 			
@@ -94,11 +95,10 @@ public class PlannedVSActualActionTypes implements PlannedVSActualActionTypesRem
 				{
 					xmlData.append("<dr_visitd>").append("<![CDATA[" + checkNull(rs.getString("DrName"))+ "]]>").append("</dr_visitd>");
 				}
-				
-				pstmt.close();
-				pstmt = null;
 				rs.close();
-				rs = null;
+				rs=null;
+				pstmt.close();
+				pstmt=null;
 				
 				sql=" select INITCAP(trim(strg_customer.first_name)||''|| (CASE WHEN trim(strg_customer.middle_name) IS NULL THEN '' ELSE (' '||strg_customer.middle_name) END ) ||' ' ||trim(strg_customer.last_name) )AS DrName from strg_meet INNER JOIN strg_customer ON strg_customer.sc_code = STRG_MEET.STRG_CODE AND STRG_CUSTOMER.CUST_TYPE = 'D' and STRG_MEET.SALES_PERS = ? and STRG_MEET.EVENT_DATE =  to_char(sysdate) MINUS select INITCAP(trim(strg_customer.first_name)||''|| (CASE WHEN trim(strg_customer.middle_name) IS NULL THEN '' ELSE (' '||strg_customer.middle_name) END ) ||' ' ||trim(strg_customer.last_name) )AS DrName from sprs_plan, strg_customer where sprs_plan.plan_status = 'P' AND STRG_CUSTOMER.CUST_TYPE = 'D' AND  sprs_plan.strg_code = strg_customer.sc_code and sprs_plan.sprs_code__plan = ? and sprs_plan.plan_date = to_char(sysdate) ORDER BY 1"; 
 			
@@ -110,10 +110,10 @@ public class PlannedVSActualActionTypes implements PlannedVSActualActionTypesRem
 				{
 					xmlData.append("<un_dr_visitd>").append("<![CDATA[" + checkNull(rs.getString("DrName"))+ "]]>").append("</un_dr_visitd>");
 				}
-				pstmt.close();
-				pstmt = null;
 				rs.close();
-				rs = null;
+				rs=null;
+				pstmt.close();
+				pstmt=null;
 				xmlData.append("</Root>");
 		} catch (Exception e)
 		{

webitm-dashboard/ibase/dashboard/sfa/ejb/ProductAssessment.java

@@ -143,6 +143,10 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
 				rawDataEmployeeProdSurveylJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{
@@ -275,6 +279,10 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
 				rawDataEmployeeProductlJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{
@@ -421,6 +429,10 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
 				rawDataEmployeeProductlJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{
@@ -511,6 +523,10 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
 				rawDataEmployeeProductlRatingJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{

webitm-dashboard/ibase/dashboard/sfa/ejb/RSRScoreEJB.java

@@ -29,8 +29,6 @@ public class RSRScoreEJB extends ValidatorEJB implements RSRScoreRemote, RSRScor
 		Connection conn = null;
 		ConnDriver connDriver = new ConnDriver();
 		DashboardUtility dashbordUtil = null;
-		
-		
 		try
 		{
 			System.out.println(" Inside RSRScoreEJB for Data Soruc Name ="+dataSourceName+" salesPerson is =" + salesPerson +" month is =" + month +" year is =" + year);
@@ -139,9 +137,6 @@ public class RSRScoreEJB extends ValidatorEJB implements RSRScoreRemote, RSRScor
 					" left outer join station on trim(employee.hobby4)=trim(station.stan_code)  "  +
 					" where RSR_SCORE.insight_id=employee.emp_code group by station.descr order by TERRITORY,INSIGHT_ID DESC ";
 			
-			
-			
-		
 			pstmt = conn.prepareStatement(sql);
 			rs = pstmt.executeQuery();
 			int count = 0;			
@@ -163,6 +158,10 @@ public class RSRScoreEJB extends ValidatorEJB implements RSRScoreRemote, RSRScor
 				rawDataMnthDivWiseSalesJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{
@@ -197,12 +196,9 @@ public class RSRScoreEJB extends ValidatorEJB implements RSRScoreRemote, RSRScor
 		
 	}
 
-	
 	public void getData()
 	{
-		
-		
-	String	sql =   "Select station.descr as territory, RSR_SCORE.insight_id as insight_id, RSR_SCORE.rep_name as sales_pers, sum(field_working_days) as field_working_days, sum(target_outlets) as target_outlets, sum(chemist_call) as chemist_call, sum(total_coverage) as total_coverage, sum(productive_coverage) as productive_coverage, round((case when sum(field_working_days)=0 then 0 else sum(chemist_call)/sum(field_working_days) end),2) as call_average, round((case when sum(target_outlets) =0 then 0 else (sum(total_coverage)/sum(target_outlets))*100  end ),0)as  TC_PER, " +
+		String	sql =   "Select station.descr as territory, RSR_SCORE.insight_id as insight_id, RSR_SCORE.rep_name as sales_pers, sum(field_working_days) as field_working_days, sum(target_outlets) as target_outlets, sum(chemist_call) as chemist_call, sum(total_coverage) as total_coverage, sum(productive_coverage) as productive_coverage, round((case when sum(field_working_days)=0 then 0 else sum(chemist_call)/sum(field_working_days) end),2) as call_average, round((case when sum(target_outlets) =0 then 0 else (sum(total_coverage)/sum(target_outlets))*100  end ),0)as  TC_PER, " +
 				"round((case when sum(target_outlets)=0 then 0 else (sum(productive_coverage)/sum(target_outlets))*100 end ),0) as  PC_PER FROM ( select A.SALES_PERS as insight_id, A.SP_NAME as rep_name, sum(case when upper(A.descr) like upper('%HALF%') then 0.5 else 1 end) as field_working_days, 0 as target_outlets, 0 as chemist_call, 0 as total_coverage, 0 as productive_coverage FROM ( SELECT DISTINCT SM.EVENT_DATE, S.SALES_PERS, S.SP_NAME , FA.descr FROM STRG_MEET SM JOIN SALES_PERS S ON SM.SALES_PERS = S.SALES_PERS JOIN (select activity_code,DESCR from fieldactivity where activity_type='FW') " +
 				" FA ON FA.activity_code=SM.EVENT_TYPE WHERE SM.Event_Date BETWEEN trunc(to_date('AUG'||'2014','MONYYYY'),'MON') And last_day(to_date('AUG'||'2014','MONYYYY')) AND STRG_TYPE = 'C' And S.Item_Ser ='OTC'" +
 			

webitm-dashboard/ibase/dashboard/sfa/ejb/RSRSurveyEJB.java

@@ -92,6 +92,10 @@ public class RSRSurveyEJB extends ValidatorEJB implements RSRSurveyRemote, RSRSu
 				rawDataRSRSurveyWiseJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{

webitm-dashboard/ibase/dashboard/sfa/ejb/RXSurveyEJB.java

@@ -98,6 +98,10 @@ public class RXSurveyEJB extends ValidatorEJB implements RXSurveyRemote, RXSurve
 				rawDataRXSurveyWiseJson.put(count, rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{

webitm-dashboard/ibase/dashboard/sfa/ejb/TargetVsAchievement.java

@@ -101,10 +101,13 @@ public class TargetVsAchievement extends ValidatorEJB  implements TargetVsAchiev
 				rowData.put("target_amt_t",      checkNull(rs.getString("TARGET_AMT")));
 				rowData.put("Achievement_amt_t", checkNull(rs.getString("ACT_AMT")));
 	
-				
 				rawEffTimeJson.put(count, rowData);
 				count++;
 			 }
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 			System.out.println("TargetVsAchievement EJB Rawdata: "+rawEffTimeJson);
 		   }
 		 }		

webitm-dashboard/ibase/dashboard/sfa/ejb/TaskActivity.java

@@ -182,6 +182,10 @@ public class TaskActivity extends ValidatorEJB implements TaskActivityLocal, Tas
 				rowDataPendingTaskJson.put(Integer.valueOf(count), rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 			System.out.println("in getTask rowDataPendingTaskJson is =" + rowDataPendingTaskJson);
 
 		} catch (Exception e)

webitm-dashboard/ibase/dashboard/sfa/ejb/TaskTracking.java

@@ -54,6 +54,10 @@ public class TaskTracking  implements TaskTrackingLocal, TaskTrackingRemote
 				rowDataPendingTaskJson.put(Integer.valueOf(count),rowData);
 				count++;
 			}
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 			System.out.println(" rowDataPendingTaskJson is =" + rowDataPendingTaskJson);
 
 		} catch (Exception e)

webitm-dashboard/ibase/dashboard/sfa/ejb/ZoneWiseQTQ.java

@@ -321,7 +321,10 @@ public class ZoneWiseQTQ extends ValidatorEJB implements ZoneWiseQTQLocal,ZoneWi
 		count++;		
 	}//closed if block
 		
-		
+         	rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}
 		catch (Exception e)
 		{

webitm-dashboard/ibase/dashboard/sfa/ejb/ZonewiseCoachingDays.java

@@ -190,7 +190,11 @@ public class ZonewiseCoachingDays extends ValidatorEJB implements ZonewiseCoachi
 				rowData.put("exportToExcel", CommonConstants.TOMCAT_HOME+"/ibase/dwh/FusionChart/images/excel.png");
 				rowDataZonewiseCoachingJson.put(count, rowData);
 				count++;
-			}		
+			}	
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
 		}catch (Exception e)
 		{
 			e.printStackTrace();