Updated component on 03/03/2020 :

EmpMaritalStatusConfPrc.java
EmpMaritalStatusIC.java


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

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

@@ -86,9 +86,9 @@ public class EmpMaritalStatusConfPrc extends ProcessEJB implements EmpMaritalSta
 		//modified by Shital on 09/08/2019 [Start]
 		//ConnDriver connDriver = null;
 		//modified by Shital on 09/08/2019 [End]
-		AppConnectParm appConnect = null;
-		InitialContext initialCtx = null;
-		//EmpMaritalStatusConfLocal empMaritalStatusConf = null;
+		//AppConnectParm appConnect = null;
+		//InitialContext initialCtx = null;
+		EmpMaritalStatusConfLocal empMaritalStatusConf = null;
 		//ITMDBAccessLocal itmDBAccess = null;
 		
 		PreparedStatement pstmt=null;
@@ -101,7 +101,7 @@ public class EmpMaritalStatusConfPrc extends ProcessEJB implements EmpMaritalSta
 			//connection = connDriver.getConnectDB("DriverITM");
 			conn = getConnection();
 			//modified by Shital on 09/08/2019 [End]
-			conn.setAutoCommit(false);
+			//conn.setAutoCommit(false);
 			/*appConnect = new AppConnectParm();
 			initialCtx = new InitialContext(appConnect.getProperty());
 			itmDBAccess = (ITMDBAccessLocal)initialCtx.lookup("ibase/ITMDBAccessEJB/local");*/
@@ -144,7 +144,7 @@ public class EmpMaritalStatusConfPrc extends ProcessEJB implements EmpMaritalSta
 			if(!"X".equalsIgnoreCase(confirm))
 			{
 				/*empMaritalStatusConf = (EmpMaritalStatusConfLocal)initialCtx.lookup("ibase/EmpMaritalStatusConf/local");*/
-				EmpMaritalStatusConf empMaritalStatusConf = new EmpMaritalStatusConf();
+				empMaritalStatusConf = new EmpMaritalStatusConf();
 				returnString = checkNull(empMaritalStatusConf.actionHandler("", headerDom, detailDom, xtraParams, "N", conn));
 				System.out.println("EmpMaritalStatusConfPrc returnString ::[" + returnString + "]");
 			}
@@ -152,22 +152,22 @@ public class EmpMaritalStatusConfPrc extends ProcessEJB implements EmpMaritalSta
 			{
 				//modified by Shital on 09/08/2019 [Start]
 				//returnString = itmDBAccess.getErrorString("", "VTALRDCACL", "", "", conn);
-				returnString = itmDBAccessEJB.getErrorString("", "VTALRDCACL", "", "", conn);
+				returnString = checkNull(itmDBAccessEJB.getErrorString("", "VTALRDCACL", "", "", conn));
 				//modified by Shital on 09/08/2019 [End]
-				
+				return returnString;
 			}
-			if(returnString.length() > 0)
+			if(returnString.length() > 0 && returnString.indexOf("VTMARSCH03")<0)
 			{
 				isError = true;
 				System.out.println("EmpMaritalStatusConfPrc isError ::[" + isError + "]");
 			}
 			else
 			{
-				//modified by Shital on 25/02/2020 [Start]
+				//modified by Shital on 09/08/2019 [Start]
 				//returnString = itmDBAccess.getErrorString("", "VTMARSCH03", "", "", conn);
-				returnString = itmDBAccessEJB.getErrorString("", "VTMARSCH03", "", "", conn);
+				returnString = checkNull(itmDBAccessEJB.getErrorString("", "VTMARSCH03", "", "", conn));
 				return returnString;
-				//modified by Shital on 25/02/2020 [End]
+				//modified by Shital on 09/08/2019 [End]
 			}
 		}
 		catch(Exception e)
@@ -219,7 +219,7 @@ public class EmpMaritalStatusConfPrc extends ProcessEJB implements EmpMaritalSta
 				//modified by Shital on 09/08/2019 [End]
 			}
 		}
-		System.out.println("errString...:: "+returnString);
+		System.out.println("errString...::"+returnString);
 		return returnString;
 	}
 	

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

@@ -710,7 +710,8 @@ public class EmpMaritalStatusIC extends ValidatorEJB implements EmpMaritalStatus
 								errList.add("VTSTAT");
 								errFields.add(childNodeName.toLowerCase());
 							}
-							if(errList.size()==0)
+							//Commented by Shital on 03/03/2019[Start] it is commented in PB Code
+							/*if(errList.size()==0)
 							{
 								//Changed By Sanket J on 01/March/18 for [new column to handle long value employee names]-[Start]
 								//sql="select case when status is null then ' ' else status end from employee where EMP_CODE =?";
@@ -723,10 +724,10 @@ public class EmpMaritalStatusIC extends ValidatorEJB implements EmpMaritalStatus
 									lsStatus=rs.getString("status");
 								}
 								//Changed By sanket on 08/MAR/18 [for proper closing connection]
-								/*pstmt.close();
+								pstmt.close();
 								pstmt=null;
 								rs.close();
-								rs=null;*/
+								rs=null;
 								close( pstmt, rs);
 								
 								if(lsStatus!=null && lsStatus.trim().length() !=0)
@@ -734,7 +735,7 @@ public class EmpMaritalStatusIC extends ValidatorEJB implements EmpMaritalStatus
 									errList.add("VTINAEMP");
 									errFields.add(childNodeName.toLowerCase());
 								}
-							}
+							}*/ //Commented by Shital on 03/03/2019[End] it is commented in PB Code
 						}
 						else if (childNodeName.equalsIgnoreCase("emp_code__aprv")) 
 						{