Updated on [15/11/2019]

PayrollSinglePrc.java
PayrollSplitgenAccPrc.java


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

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

@@ -147,6 +147,7 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
 		payrollSplitgenAccPrc = new PayrollSplitgenAccPrc();
 		interestProcessConfPrc = new InterestProcessConfPrc();
 		payrollArrearsProcessingPrc = new PayrollArrearsProcessingPrc();
+		this.hrLogWriter = hrLogWriter;
 		ResultSet rs = null;
 		PreparedStatement pstmt = null;
 		//SimpleDateFormat sdf = null;
@@ -669,8 +670,6 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
 
 	public void gbfSetLogPropertiesByCaller(HRLogWriter logwriterDb)
 	{
-		//hrLogWriter = new HRLogWriter();
-		this.hrLogWriter = new HRLogWriter();
 		try 
 		{
 			System.out.println("Inside PayrollSinglePrc.gbf_set_log_properties_by_caller()");
@@ -789,20 +788,23 @@ public class PayrollSinglePrc extends ProcessEJB implements PayrollSinglePrcLoca
 		}
 		return liRet;
 	}
-	public HRLogWriter gbfServeLogPropertiesToCaller()
+	
+	public HRLogWriter gbfServeLogPropertiesToCaller ()
 	{
-		//HRLogWriter hrLogWriter = new HRLogWriter();
-		this.hrLogWriter = new HRLogWriter();
 		return hrLogWriter;
 	}
 
+	public void gbfSetLogpropertiesFromTarget ()
+	{
+		HRLogWriter logWriter = gbfServeLogPropertiesToCaller();
+		hrLogWriter.setLineNo(logWriter.getLineNo());
+	}
+	
 	public void gbfSetLogPropertiesFromTarget()
 	{
-		System.out.println("PayrollSinglePrc.gbfSetLogPropertiesFromTarget()");
-	//	HRLogWriter lstrLogWriter = new HRLogWriter();
-		this.hrLogWriter = new HRLogWriter();
-		//lstrLogWriter = gbfServeLogPropertiesToCaller();
-		hrLogWriter  = gbfServeLogPropertiesToCaller();
+		
+		HRLogWriter logWriter = gbfServeLogPropertiesToCaller();
+		hrLogWriter.setLineNo(logWriter.getLineNo());
 	}
 
 	private String checkNull(String input) 

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

@@ -147,12 +147,12 @@ 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
 	{
 		//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;
@@ -3540,7 +3540,7 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
 	public boolean gbfJobTerminateRequested (Connection conn) throws ITMException, SQLException
 	{
 		System.out.println("Calling gbfJobTerminateRequested (Connection conn) of PayrollSplitgenAccPrc");
-		if(hrLogWriter.gfJobterminateRequested(hrLogWriter.getJobID(), conn))
+		if(hrLogWriter.gfJobterminateRequested(hrLogWriter.getJobID(),conn))
 		{
 			hrLogWriter.setJobTerminateRequested("Y");
 			return true;