Sana S: Modified on 07/01/2020

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

webitm-adm/src/ibase/webitm/ejb/adm/adv/HolChangeCanc.java

@@ -8,6 +8,7 @@ import javax.naming.InitialContext;
 import java.sql.*;
 import java.text.*;
 import ibase.system.config.*;
+import ibase.utility.E12GenericUtility;
 import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.ejb.*;
@@ -48,9 +49,10 @@ public class HolChangeCanc extends ActionHandlerEJB implements HolChangeCancLoca
 		java.sql.Timestamp holDateForSql = null;
 		java.sql.Timestamp holDateToSql = null;
 
-		GenericUtility genericUtility = GenericUtility.getInstance();
-		
-		
+		//Modified by Sana S on 07/01/2020 [start]
+		//GenericUtility genericUtility = GenericUtility.getInstance();
+		E12GenericUtility genericUtility = new E12GenericUtility();
+		//Modified by Sana S on 07/01/2020 [end]
 		
 		String userID = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"LoginCode");
 		String siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSiteCode");
@@ -90,10 +92,13 @@ public class HolChangeCanc extends ActionHandlerEJB implements HolChangeCancLoca
 			holDateToSql = java.sql.Timestamp.valueOf(genericUtility.getValidDateTimeString(holDateTo,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()));
 
 			System.out.println("TO DATE STRING AFTER DBDATE [" + holDateToSql + "]");			
-			
-			ConnDriver connDriver = new ConnDriver();
+			// Modified by Sana S on 07/01/2020 [start]
+			/*ConnDriver connDriver = new ConnDriver();
 			conn = connDriver.getConnectDB("DriverITM");
-			conn.setAutoCommit(false);
+			conn.setAutoCommit(false);*/
+			
+			conn=getConnection();
+			// Modified by Sana S on 07/01/2020 [start]
 			
 			System.out.println("emp Code [" + empCode + "] hol date for [" + holDateForSql + "]  hol date to [" + holDateToSql + "] hol type" +holType );
 			
@@ -190,7 +195,8 @@ public class HolChangeCanc extends ActionHandlerEJB implements HolChangeCancLoca
 				//Added by sarita on 25 JULY 18 [START]
 				itmDBAccess = null;
 				//Added by sarita on 25 JULY 18 [END]
-					if (rs != null)
+				//Modified by Sana S on 07/01/2020 [start]	
+				/*if (rs != null)
 					{
 						rs.close();
 						rs = null;
@@ -199,7 +205,9 @@ public class HolChangeCanc extends ActionHandlerEJB implements HolChangeCancLoca
 					{
 						pstmt.close();
 						pstmt = null;
-					}
+					}*/
+				closePstmtRset(pstmt,rs);
+				//Modified by Sana S on 07/01/2020 [end]	
 					if (conn != null)
 					{
 						conn.close();