updated SiteHolTblIC component

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

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

@@ -144,10 +144,19 @@ public class SiteHolTblIC extends ValidatorEJB implements SiteHolTblLocal,SiteHo
 						}
 					}
 
-					else if("hol_tblno".equalsIgnoreCase(childNodeName))
+					else if (childNodeName.equalsIgnoreCase("hol_tblno")) 
 					{
 						holTblNo = checkNull(genericUtility.getColumnValue("hol_tblno", dom));
-						sql = "Select count(*) as cnt from gencodes where fld_name = 'HOL_TBLNO' and mod_name = 'X' and fld_value = ? ";
+
+						if(holTblNo == null || holTblNo.trim().length() == 0)
+						{
+							errList.add("VMHOLTBL");// Holiday Table cannot be Empty
+							errFields.add(childNodeName.toLowerCase());
+						}
+						else
+						{
+							holTblNo = checkNull(genericUtility.getColumnValue("hol_tblno", dom));
+							sql = "select count(*) as cnt from gencodes where fld_name = 'HOL_TBLNO' and mod_name = 'X' and fld_value = ?";
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1, holTblNo);
 							rs = pstmt.executeQuery();
@@ -165,15 +174,17 @@ public class SiteHolTblIC extends ValidatorEJB implements SiteHolTblLocal,SiteHo
 								pstmt.close();
 								pstmt = null;
 							}
-						if(cnt == 0)
+							if(cnt > 0 && !"E".equalsIgnoreCase(editFlag))
 							{
-							errList.add("VMHOLTBL");
+								errList.add("VMHOLTBL");//Data Already Existed for Entered SITE_HOLTBL_MAP Table
 								errFields.add(childNodeName.toLowerCase());
 							}
 						}
 
 					}
+
 				}
+
 				System.out.println("errStringXml.toString()---1= "+errStringXml.toString());
 				if (errList != null && errList.size() > 0)
 				{
@@ -211,6 +222,7 @@ public class SiteHolTblIC extends ValidatorEJB implements SiteHolTblLocal,SiteHo
 				errStringXml.append("</Errors></Root>\r\n");
 				System.out.println("errStringXml.toString()---2= "+errStringXml.toString());
 			}
+		}
 			catch(Exception e)
 			{
 				e.printStackTrace();
@@ -220,11 +232,7 @@ public class SiteHolTblIC extends ValidatorEJB implements SiteHolTblLocal,SiteHo
 			{
 				try
 				{
-				if(conn != null)
-				{
-					conn.close();
-					conn = null;
-				}
+
 					if(rs != null)
 					{
 						rs.close();
@@ -235,6 +243,11 @@ public class SiteHolTblIC extends ValidatorEJB implements SiteHolTblLocal,SiteHo
 						pstmt.close();
 						pstmt = null;
 					}
+					if(conn != null)
+					{
+						conn.close();
+						conn = null;
+					}
 				}
 				catch(Exception e)
 				{
@@ -353,7 +366,6 @@ public class SiteHolTblIC extends ValidatorEJB implements SiteHolTblLocal,SiteHo
 							valueXmlString.append("<site_descr>").append("<![CDATA[" + lsDescr + "]]>").append("</site_descr>");
 						}
 						valueXmlString.append("<site_code protect='1'>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>\r\n");
-
 					}
 
 					else if("itm_defaultedit".equalsIgnoreCase(currentColumn))
@@ -406,11 +418,7 @@ public class SiteHolTblIC extends ValidatorEJB implements SiteHolTblLocal,SiteHo
 			{
 				try
 				{
-				if(conn != null)
-				{
-					conn.close();
-					conn = null;
-				}
+
 					if(rs != null)
 					{
 						rs.close();
@@ -421,6 +429,11 @@ public class SiteHolTblIC extends ValidatorEJB implements SiteHolTblLocal,SiteHo
 						pstmt.close();
 						pstmt = null;
 					}
+					if(conn != null)
+					{
+						conn.close();
+						conn = null;
+					}
 				}
 				catch(Exception e)
 				{
@@ -497,5 +510,5 @@ public class SiteHolTblIC extends ValidatorEJB implements SiteHolTblLocal,SiteHo
 			}
 			return input.trim();
 		}
-}
+	}