Sana S: Modified on 07/01/2020

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

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

@@ -3,6 +3,7 @@ package ibase.webitm.ejb.adm.adv;
 import java.rmi.RemoteException;
 
 import ibase.system.config.ConnDriver;
+import ibase.utility.E12GenericUtility;
 import ibase.utility.EMail;
 import ibase.webitm.ejb.ITMDBAccessEJB;
 //import ibase.webitm.ejb.ITMDBAccessLocal;//Commented by sarita on 20 JULY 18
@@ -65,7 +66,10 @@ public class HolChangeConf extends ActionHandlerEJB implements HolChangeConfLoca
 		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]
 		//ITMDBAccessLocal itmDBAccessLocal = (ITMDBAccessLocal) new ITMDBAccessEJB();
 
 		String userID = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"LoginCode");
@@ -107,10 +111,12 @@ public class HolChangeConf extends ActionHandlerEJB implements HolChangeConfLoca
 
 			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 [end]
 			
 
 			System.out.println("emp Code [" + empCode + "] hol date for [" + holDateForSql + "]  hol date to [" + holDateToSql + "] hol type" +holType );
@@ -218,7 +224,8 @@ public class HolChangeConf extends ActionHandlerEJB implements HolChangeConfLoca
 					//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;
@@ -227,7 +234,9 @@ public class HolChangeConf extends ActionHandlerEJB implements HolChangeConfLoca
 					{
 						pstmt.close();
 						pstmt = null;
-					}
+					}*/
+				    closePstmtRset(pstmt, rs);
+				  //Modified by Sana S on 07/01/2020 [end]
 					if (conn != null)
 					{
 						conn.close();