Sana S: Modified on 03/03/20

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

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

@@ -838,8 +838,18 @@ public class LeaveConvertPrc extends ProcessEJB implements LeaveConvertPrcLocal,
 				dwDataMap.put("emp_mname", checkNull(rs.getString("emp_mname")));
 				dwDataMap.put("emp_lname", checkNull(rs.getString("emp_lname")));
 				//Modifed by Sana S on [27/02/20] [start]
-				dwDataMap.put("relieve_date", sdf.format(rs.getDate("relieve_date")));
+				//dwDataMap.put("relieve_date", sdf.format(rs.getDate("relieve_date")));
 				//dwDataMap.put("relieve_date", rs.getString("relieve_date"));
+				
+				if(rs.getDate("relieve_date")==null)
+				{
+					dwDataMap.put("relieve_date", "");
+				}
+				else
+				{
+					dwDataMap.put("relieve_date", sdf.format(rs.getDate("relieve_date")));
+				}
+					
 
 				System.out.print("Relieve Date:"+rs.getString("relieve_date"));
 				/*dwDataMap.put("eff_date", rs.getDate("eff_date"));