Updated on[25/11/2019][changes done as suggested by Piyush sir.]

InterestProcess.java
InterestProcessConfPrc.java
PayrollArrearsProcessingPrc.java
PayrollSinglePrc.java
PayrollSplitgenAccPrc.java


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

webitm-adm/src/ibase/webitm/ejb/adm/InterestProcess.java

@@ -14,7 +14,6 @@ import java.util.Map;
 import java.util.Set;
 
 import ibase.utility.E12GenericUtility;
-import ibase.webitm.bean.adm.LogWriterDatabase;
 import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.ejb.sys.UtilMethods;
@@ -23,7 +22,10 @@ import ibase.webitm.utility.ITMException;
 public class InterestProcess extends ValidatorEJB
 {
 	E12GenericUtility genericUtility = new E12GenericUtility();
-	LogWriterDatabase logWriter = new LogWriterDatabase();
+	//Modified By Poonam B[15/11/2019][START]
+	//LogWriterDatabase logWriter = new LogWriterDatabase();
+	HRLogWriter logWriter = new HRLogWriter();
+	//Modified By Poonam B[15/11/2019][END]
 	UtilMethods utilmethod = new UtilMethods();
 	ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB();
 	AdmCommon admCommon = new AdmCommon();
@@ -35,9 +37,23 @@ public class InterestProcess extends ValidatorEJB
 	String isLogObjName = logWriter.getObjName();
 	String isActivity = logWriter.getActivity();
 	String isProcId = logWriter.getProcessId();
-	String isLogFileName = logWriter.getLogFileName();
-	String isProcMode = "D";
+	//Added By Poonam B[21/11/2019][START]
+	private String isProcMode = "D";
+	private String isLogFileName = logWriter.getLogFileName();
+	public String getIsLogFileName() {
+		return isLogFileName;
+	}
+	public void setIsLogFileName(String isLogFileName) {
+		this.isLogFileName = isLogFileName;
+	}
+	public String getIsProcMode() {
+		return isProcMode;
+	}
 
+	public void setIsProcMode(String isProcMode) {
+		this.isProcMode = isProcMode;
+	}
+	//Added By Poonam B[21/11/2019][END]
 	//gbf_loan_confirm_no_edi = loanConfirmNoEdi
 	public String loanConfirmNoEdi(String lsLoanNo, Timestamp ldEff, Timestamp ldExp, double lcIntAmt, String lsScheme, String empCode, int aiCommit, String xtraParams, Connection conn) throws ITMException
 	{
@@ -644,7 +660,12 @@ public class InterestProcess extends ValidatorEJB
 				lcLoanAmt = ((Double) dwLoanInfoMap.get("loan_amt")).doubleValue();
 				System.out.println("ldInterestDate===> " +ldInterestDate);
 				logWriter.setTotalRows(logWriter.getTotalRows()+1);
-
+				//Added By Poonam B[25/11/2019][START]
+				if(ldInterestDate == null)
+				{
+					ldInterestDate = ldIssue;
+				}
+				//Added By Poonam B[25/11/2019][END]
 				while (1 == 1)
 				{
 					liPyrl = 0;
@@ -679,16 +700,21 @@ public class InterestProcess extends ValidatorEJB
 					}
 					rsLoanRegCnt.close();
 					pstmtLoanRegCnt.clearParameters();
+					System.out.println("ll_rowcnt:::"+ll_rowcnt);
 					if(ll_rowcnt == 0)
 					{
 						ldFrom = ldInterestDate;
 					}
 					else
+					{
+						//Modified by Poonam B[15/11/2019][START][To avoid null pointer]
+						if(ldInterestDate != null)
 						{
 							ldFrom = utilmethod.dateTime(utilmethod.RelativeDate(utilmethod.dateTime(ldInterestDate), 1));
-						System.out.println("ldFrom == "+ldFrom);
 						}
-
+						//Modified by Poonam B[15/11/2019][END][To avoid null pointer]
+					}
+					System.out.println("ldFrom == "+ldFrom);
 					if(ldRelieve != null && ldRelieve.before(ldTo))
 					{
 						ldTodate = ldRelieve;
@@ -2613,61 +2639,65 @@ public class InterestProcess extends ValidatorEJB
 	//gbf_set_log_properties_by_caller = gbfSetLogPropertiesByCaller
 	public void gbfSetLogPropertiesByCaller(HRLogWriter logwriterDb)
 	{
-		//Modified By Poonam B on[27/08/2019][Start]
+		//Modified By Poonam B on[15/11/2019][Start]
 		//LogWriterDatabase istrLogWriter = new LogWriterDatabase();
-		HRLogWriter istrLogWriter = new HRLogWriter();
+		//HRLogWriter istrLogWriter = new HRLogWriter(); //Modified By Poonam B[15/11/2019]
 		//Modified By Poonam B on[27/08/2019][Start]
 		try 
 		{
 			System.out.println("Inside InterestProcess.gbfSetLogPropertiesByCaller()");
 
-			istrLogWriter.setJobID(logwriterDb.getJobID());
-			istrLogWriter.setLineNo(logwriterDb.getLineNo());
-			istrLogWriter.setObjName(logwriterDb.getObjName());
+			logWriter.setJobID(logwriterDb.getJobID());
+			logWriter.setLineNo(logwriterDb.getLineNo());
+			logWriter.setObjName(logwriterDb.getObjName());
 			//Modified By Poonam B on[27/08/2019][Start]
 			//if(istrLogWriter.getTransactionCreatedBy() == null && logwriterDb.getTransactionCreatedBy() != null)
-			if(logwriterDb.getTransactionCreatedBy() == null && logwriterDb.getTransactionCreatedBy() != null)
+			//Modified By Poonam B on[25/11/2019][START]
+			//if(logwriterDb.getTransactionCreatedBy() == null && logwriterDb.getTransactionCreatedBy() != null)
+			if(logWriter.getTransactionCreatedBy() == null && logwriterDb.getTransactionCreatedBy() != null)
+			//Modified By Poonam B on[25/11/2019][END]	
 			{
+				//logWriter.setTransactionCreatedBy(logwriterDb.getTransactionCreatedBy());
 				//Modified By Poonam B on[27/08/2019][END]
-				istrLogWriter.setTransactionCreatedBy(logwriterDb.getTransactionCreatedBy());
-				istrLogWriter.setTransactionCreatedBy("caller");
+				logWriter.setTransactionCreatedBy("caller");
 			}
 
 			if(logwriterDb.getLogFileName() != null && logwriterDb.getLogFileName().trim().length() > 0)
 			{
-				istrLogWriter.setLogFileName(logwriterDb.getLogFileName());
-				istrLogWriter.setLogFileCreatedBy("caller");
+				logWriter.setLogFileName(logwriterDb.getLogFileName());
+				logWriter.setLogFileCreatedBy("caller");
 			}
 
 			if(logwriterDb.getFilePointer() != 0 && logwriterDb.getFilePointer() > 0)
 			{
-				istrLogWriter.setFilePointer(logwriterDb.getFilePointer());
-				istrLogWriter.setLogFileCreatedBy("caller");
+				logWriter.setFilePointer(logwriterDb.getFilePointer());
+				logWriter.setLogFileCreatedBy("caller");
 			}
 
 			if(logwriterDb.getWsrLogFileName() != null && logwriterDb.getWsrLogFileName().trim().length() > 0)
 			{
-				istrLogWriter.setWsrLogFileName(logwriterDb.getWsrLogFileName());
+				logWriter.setWsrLogFileName(logwriterDb.getWsrLogFileName());
 			}
 
 			if(logwriterDb.getLogLocationType() != null && logwriterDb.getLogLocationType().trim().length() > 0)
 			{
-				istrLogWriter.setLogLocationType(logwriterDb.getLogLocationType());
-				istrLogWriter.setLogServerAddress(logwriterDb.getLogServerAddress());
+				logWriter.setLogLocationType(logwriterDb.getLogLocationType());
+				logWriter.setLogServerAddress(logwriterDb.getLogServerAddress());
 			}
 
-			istrLogWriter.setProcessId(logwriterDb.getProcessId());
-			istrLogWriter.setLogLineNo(logwriterDb.getLogLineNo());
+			logWriter.setProcessId(logwriterDb.getProcessId());
+			logWriter.setLogLineNo(logwriterDb.getLogLineNo());
 
 			if(logwriterDb.getStartDateTime() != null)
 			{
-				istrLogWriter.setStartDateTime(logwriterDb.getStartDateTime());
+				logWriter.setStartDateTime(logwriterDb.getStartDateTime());
 			}
 			//Added By Poonam B on[27/08/2019][Start]
 			if(logwriterDb.getJobID() != null && logwriterDb.getJobID().trim().length() > 0)
 			{
-				istrLogWriter.setJobID(logwriterDb.getJobID());
+				logWriter.setJobID(logwriterDb.getJobID());
 			}
+			//Modified By Poonam B on[15/11/2019][END]
 			//Added By Poonam B on[27/08/2019][END]
 		}
 		catch (Exception e) 

webitm-adm/src/ibase/webitm/ejb/adm/PayrollArrearsProcessingPrc.java

@@ -31,13 +31,39 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
 	HRLogWriter hrLogWriter = new HRLogWriter();
 	UtilMethods utilMethod = new UtilMethods();
 	String userId = "", chgTerm = "", loginSite = "";
-	String isOwrite = "N";
-	boolean ibTodoprojection = true;
-	String isLogfileName = "";
+	//Added By Poonam B[21/11/2019][START][To use variable outside]
+	//String isOwrite = "N";
+	private String isOwrite = "N";
+	private String isLogfileName = "";
+	private boolean ibTodoprojection = true;
 
+	public String getIsOwrite() {
+		return isOwrite;
+	}
+
+	public void setIsOwrite(String isOwrite) {
+		this.isOwrite = isOwrite;
+	}
+	
+	public String getIsLogfileName() {
+		return isLogfileName;
+	}
+
+	public void setIsLogfileName(String isLogfileName) {
+		this.isLogfileName = isLogfileName;
+	}
+	
+	public boolean isIbTodoprojection() {
+		return ibTodoprojection;
+	}
+
+	public void setIbTodoprojection(boolean ibTodoprojection) {
+		this.ibTodoprojection = ibTodoprojection;
+	}
+
+	//Added By Poonam B[21/11/2019][END][To use variable outside]
 	public String process(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException, ITMException 
 	{
-
 		Document detailDom = null;
 		Document headerDom = null;
 		String retStr = "";
@@ -71,6 +97,7 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
 			loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"));
 			objName = getObjNameFromDom(headerDom, "objName");
 			System.out.println("objName coming from getObjNameFromDom method:::: " + objName);
+			hrLogWriter.setProcessId("ChangeArrearsProcess");  //Added by Poonam B[21/11/2019]
 			hrLogWriter.setActivity("ArrearsProcess");
 			hrLogWriter.setFileNameStartWith("CHGARRPROC_");
 			activity = hrLogWriter.getActivity();
@@ -124,7 +151,9 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
 		return retStr;
 	}// END OF PROCESS
 	
-	public String process(Document headerDom, Document detailDom, String windowName, String xtraParams,HRLogWriter hrLogWriter, Connection conn, Connection logConn) throws RemoteException, ITMException 
+	// Change argument name of hrlogwriter
+	// public String process(Document headerDom, Document detailDom, String windowName, String xtraParams,HRLogWriter hrLogWriter, Connection conn, Connection logConn) throws RemoteException, ITMException 
+	public String process(Document headerDom, Document detailDom, String windowName, String xtraParams,HRLogWriter hrLogWriterArg, Connection conn, Connection logConn) throws RemoteException, ITMException 
 	{
 		UserInfoBean userinfo = new UserInfoBean();
 		ResultSet rs = null, rs1 = null;
@@ -139,6 +168,7 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
 		
 		try
 		{
+			hrLogWriter = hrLogWriterArg; // Mapped argument to class level variable
 			System.out.println("****Inside PayrollArrearsProcessingPrc process method called*****");
 			userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
 			chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));
@@ -148,7 +178,7 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
 			//System.out.println("objName coming from getObjNameFromDom method:::: " + objName);
 			hrLogWriter.setCurrentProcess("ChangeArrearsProcess");
 			//hrLogWriter.setActivity("ArrearsProcess");
-			hrLogWriter.setProcessId("ChangeArrearsProcess");
+			//hrLogWriter.setProcessId("ChangeArrearsProcess");   // commented By Poonam B[21/11/2019]
 			//hrLogWriter.setFileNameStartWith("CHGARRPROC_");
 			currentProcess = hrLogWriter.getCurrentProcess();
 			//activity = hrLogWriter.getActivity();
@@ -179,6 +209,9 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
 			}
 			mtype = checkNull(genericUtility.getColumnValue("type", headerDom));
 			System.out.println("mtype::: " + mtype);
+			
+			// To be used logwriter method.Start
+			/*
 			hrLogWriter = gbfErrWrite("", "", "Process Started", "I",hrLogWriter,logConn);
 			errorCode = hrLogWriter.getReturnUpdError();
 			if(errorCode != null && errorCode.trim().length() > 0)
@@ -186,10 +219,19 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
 				errString = errorCode;
 				return errString;
 			}
-			errString = gbfProcessChangeArrears(headerDom, xtraParams,hrLogWriter, conn,logConn);
+			*/
+			hrLogWriter.gbfErrWrite("", "","", "Process Started", "I",logConn);
+			
+			// To be used logwriter method.End
+			
+			// Removed logwriter argument as it is declared at class level
+			// errString = gbfProcessChangeArrears(headerDom, xtraParams,hrLogWriter, conn,logConn);
+			errString = gbfProcessChangeArrears(headerDom, xtraParams, conn,logConn);
 			System.out.println("errString coming from gbfProcessChangeArrears::: " + errString);
 			if("Y".equalsIgnoreCase(hrLogWriter.getJobTerminateRequested()))
 			{
+				// To be used logwriter method.Start
+				/*
 				hrLogWriter = gbfErrWrite("", "","Process Terminated on request" ,"I",hrLogWriter,logConn) ;
 				errorCode = hrLogWriter.getReturnUpdError();
 				if(errorCode != null && errorCode.trim().length() > 0)
@@ -197,6 +239,11 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
 					errString = errorCode;
 					return errString;
 				}
+				*/
+				hrLogWriter.gbfErrWrite("", "","", "Process Terminated on request", "I",logConn);
+				
+				// To be used logwriter method.End
+				
 			}
 
 			/*catch (corbacommfailure ccf)
@@ -238,8 +285,14 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
 		end if*/
 
 			lsLogStr = "Total Employees: " + String.valueOf(hrLogWriter.getRowsProcessed() + hrLogWriter.getRowsRejected()).trim() + " Processed: " + String.valueOf(hrLogWriter.getRowsProcessed()).trim() + " Rejected: " + String.valueOf(hrLogWriter.getRowsRejected()).trim(); 
+			// To be used logwriter method.Start
+			/*
 			hrLogWriter = gbfErrWrite("", "", lsLogStr, "I", hrLogWriter, logConn);
 			hrLogWriter = gbfErrWrite("", "", "Process Over", "I", hrLogWriter, logConn);
+			*/
+			hrLogWriter.gbfErrWrite("", "","", lsLogStr, "I",logConn);
+			hrLogWriter.gbfErrWrite("", "","", "Process Over", "I",logConn);
+			// To be used logwriter method.End
 			gbfReleaseLogWriter();
 
 		}//END TRY PROCESS
@@ -253,7 +306,9 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
 		return errString;
 	}
 	
-	private String gbfProcessChangeArrears(Document headerDom,String xtraParams,HRLogWriter hrLogWriter, Connection conn,Connection logConn) throws RemoteException, ITMException 
+	// Removed logwriter argument as logwriter is declared at class level
+	// private String gbfProcessChangeArrears(Document headerDom,String xtraParams,HRLogWriter hrLogWriter, Connection conn,Connection logConn) throws RemoteException, ITMException 
+	private String gbfProcessChangeArrears(Document headerDom,String xtraParams, Connection conn,Connection logConn) throws RemoteException, ITMException 
 	{
 		String lsEmpcodeFr = "", lsEmpcodeTo = "", lsPrdcodeArr = "", lsSitecodeFr = "", lsSitecodeTo = "", lsProcFr = "", lsProcTo = "";
 		String  lsEmpcode = "", lsPrdcode = "", mtype = "";
@@ -378,11 +433,14 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
 				errString = "NORECFND";
 				return errString;
 			}
-			
-			splitgenAcc.isOwrite = "Y"; 
+			//Modified By Poonam B[25/11/2019][START]
+			//splitgenAcc.isOwrite = "Y"; 
+			splitgenAcc.setIsOwrite("Y");
 			isLogfileName = hrLogWriter.getLogFileName();
 			//splitgenAcc.isLogfileName = isLogfileName;
-			splitgenAcc.isCaller = "CHANGEARREARSPROCESS";
+			//splitgenAcc.isCaller = "CHANGEARREARSPROCESS";
+			splitgenAcc.setIsCaller("CHANGEARREARSPROCESS");
+			//Modified By Poonam B[25/11/2019][END]
 			
 			rowcnt = headerRowMap.size();
 			System.out.println("rowcnt---[" + rowcnt + "]");
@@ -642,6 +700,8 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
 		return errString;
 	}
 
+	// Removed local method as to be used of logwriter class
+	/*
 	public  HRLogWriter gbfErrWrite (String asType, String asEmpCode, String asErrcode, String asMsgType,HRLogWriter hrLogWriter,Connection logConn) throws ITMException
 	{
 		String lsStr = "" , lsErr = "" , lsErrcode = "";
@@ -681,6 +741,7 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
 		}
 		return hrLogWriter;
 	}
+	*/
 	
 	public int gbfReleaseLogWriter() throws ITMException
 	{
@@ -733,7 +794,7 @@ public class PayrollArrearsProcessingPrc extends ProcessEJB implements PayrollAr
 
 			if(hrLogWriter.getTransactionCreatedBy() == null && logwriterDb.getTransactionCreatedBy() != null)
 			{
-				hrLogWriter.setTransactionCreatedBy(logwriterDb.getTransactionCreatedBy());
+				// hrLogWriter.setTransactionCreatedBy(logwriterDb.getTransactionCreatedBy());
 				hrLogWriter.setTransactionCreatedBy("caller");
 			}
 

webitm-adm/src/ibase/webitm/ejb/adm/PayrollSplitgenAccPrc.java

@@ -42,12 +42,55 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
 	ArrayList<Timestamp> fromDates = new ArrayList<Timestamp>();
 	ArrayList<Timestamp> toDates = new ArrayList<Timestamp>();
 	String cPaySite = "", cPayTable = "", cFinEnt = "";
-	String isCaller = "SELF";
+	String popstat = "N", arrgen = "N";
 	String isLogLocationType = "N";
-	String popstat = "N", arrgen = "N", isOwrite = "N";
-	String isFilename = "c:\\appl\\itm26\\pay_err.log", isPayarrProc = "N";
-	String isSingle = "N", isItaxproc = "N";
-	String	isProcId = "PayrollProcess";
+	String isPayarrProc = "N" , isItaxproc = "N";
+	// Added by Poonam B [21/11/2019][START]
+	private String isCaller = "SELF";
+	private  String isOwrite = "N";
+	private String isFilename = "c:\\appl\\itm26\\pay_err.log";
+	private String isSingle = "N";
+	private String	isProcId = "PayrollProcess";
+	
+	public String getIsCaller() {
+		return isCaller;
+	}
+
+	public void setIsCaller(String isCaller) {
+		this.isCaller = isCaller;
+	}
+
+	public String getIsOwrite() {
+		return isOwrite;
+	}
+
+	public void setIsOwrite(String isOwrite) {
+		this.isOwrite = isOwrite;
+	}
+
+	public String getIsFilename() {
+		return isFilename;
+	}
+
+	public void setIsFilename(String isFilename) {
+		this.isFilename = isFilename;
+	}
+
+	public String getIsSingle() {
+		return isSingle;
+	}
+
+	public void setIsSingle(String isSingle) {
+		this.isSingle = isSingle;
+	}
+	public String getIsProcId() {
+		return isProcId;
+	}
+
+	public void setIsProcId(String isProcId) {
+		this.isProcId = isProcId;
+	}
+	//Added by Poonam B [21/11/2019][END]
 	String idSetDateStr = "";
 	Timestamp idStatusDate = null, lDate = null; 
 	String runMode = "V";
@@ -147,12 +190,13 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
 		System.out.println("returning from Process "+resString);
 	    return resString;
 	}
-	public String gbfProcessPayroll(Document dom, Document dom1, String xtraParams, HRLogWriter hrLogWriter, Connection conn, Connection logConn) throws ITMException
+	//Modified by Poonam B [25/11/2019][START]
+	// Change argument name of hrlogwriter
+	// public String process(Document headerDom, Document detailDom, String windowName, String xtraParams,HRLogWriter hrLogWriter, Connection conn, Connection logConn) throws RemoteException, ITMException 	
+	public String gbfProcessPayroll(Document dom, Document dom1, String xtraParams, HRLogWriter hrLogWriterArg, Connection conn, Connection logConn) throws ITMException, Exception
 	{
+		//Modified by Poonam B [25/11/2019][END]
 		//String chgTerm = "", loginSite = "",  userId = "";
-		//Added By Poonam B[18/10/2019][START][To avoid null pointer exception]
-		this.hrLogWriter = hrLogWriter;
-		//Added By Poonam B[18/10/2019][END][To avoid null pointer exception]
 		String empCodeFr = "", empCodeTo = "", fromSite = "", toSite = "", procGroupFr = "", procGroupTo = "", prdCodeFr = "", prdCodeTo = "",
 				prdCodeArr = "", considerAttd = "", dataOWrite = "", payrollDateStr = "", type = "", isConsiderAttd = "", errorString = "";
 		int totPrd = 0;
@@ -206,6 +250,10 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
 		double calcDays = 0d;
 		try
 		{
+			//Added By Poonam B[18/10/2019][START][To avoid null pointer exception]
+			hrLogWriter = hrLogWriterArg; // Assigned argument to class level variable
+			//Added By Poonam B[18/10/2019][END][To avoid null pointer exception]
+			
 			/*userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
 			chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));
 			loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"));*/
@@ -1754,7 +1802,10 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
 				conn.rollback();
 			}
 			catch(Exception e1){}
-			throw new ITMException(e);
+			//Modified By Poonam B[25/11/2019][To avoid string literal too long error][START]
+			//throw new ITMException(e);
+			throw new Exception(e); 
+			//Modified By Poonam B[25/11/2019][To avoid string literal too long error][END]
 		}
 		finally
 		{
@@ -3538,8 +3589,6 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
 		}
 	}
 	public boolean gbfJobTerminateRequested (Connection conn) throws ITMException, SQLException
-	{
-		try 
 	{
 		System.out.println("Calling gbfJobTerminateRequested (Connection conn) of PayrollSplitgenAccPrc");
 		if(hrLogWriter.gfJobterminateRequested(hrLogWriter.getJobID(),conn))
@@ -3552,13 +3601,6 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
 			return false;
 		}
 	}
-		catch(Exception e) 
-		{
-			System.out.println("Exception in gbfJobTerminateRequested............");
-			return false;
-		}
-		
-	}
 	public String gbfLoanInst(String empCode, String currPrd, String procType, Timestamp ldEffDate, Timestamp ldExpDate, String xtraParams, Connection conn, Connection logConn) throws ITMException
 	{
 		System.out.println("Calling gbfLoanInst(String empCode, String currPrd, String procType, String xtraParams, Connection conn, Connection logConn) of PayrollSplitgenAccPrc");
@@ -4209,7 +4251,7 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
 			
 			if(hrLogWriter.getTransactionCreatedBy() == null && logwriterDb.getTransactionCreatedBy() != null)
 			{
-				hrLogWriter.setTransactionCreatedBy(logwriterDb.getTransactionCreatedBy());
+				//hrLogWriter.setTransactionCreatedBy(logwriterDb.getTransactionCreatedBy());
 				hrLogWriter.setTransactionCreatedBy("caller");
 			}
 			
@@ -4251,7 +4293,8 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
 		}
 		
 	}
-	public HRLogWriter gbfServeLogPropertiesToCaller ()
+	// Commented By Poonam B[25/11/2019][method has never used anywhere][START]
+	/*public HRLogWriter gbfServeLogPropertiesToCaller ()
 	{
 		return hrLogWriter;
 	}
@@ -4260,7 +4303,8 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
 	{
 		HRLogWriter logWriter = gbfServeLogPropertiesToCaller();
 		hrLogWriter.setLineNo(logWriter.getLineNo());
-	}
+	}*/
+	// Commented By Poonam B[25/11/2019][method has never used anywhere][END]
 	
 	private void closeResources(PreparedStatement pstmt,ResultSet rs)
 	{