*** empty log message ***

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

webitm-dis/ibase/webitm/ejb/dis/CustomerItem.java

@@ -133,6 +133,11 @@ public class CustomerItem extends ValidatorEJB implements CustomerItemLocal,Cust
 					{
 						count =  rs.getInt(1);
 					}
+					rs.close();
+					rs = null;
+					pstmt.close();
+					pstmt = null;
+					
 					if(count == 0) 
 					{
 						errCode = "VTITEM1";
@@ -167,10 +172,7 @@ public class CustomerItem extends ValidatorEJB implements CustomerItemLocal,Cust
 						}
 					}
 					// Changed By Nasruddin [9/SEP/16] End
-					rs.close();
-					rs = null;
-					pstmt.close();
-					pstmt = null;
+					
 				}
 				else if(childNodeName.equalsIgnoreCase("unit"))
 				{

webitm-dis/ibase/webitm/ejb/dis/ItemSerChange.java

@@ -101,8 +101,8 @@ public class ItemSerChange extends ValidatorEJB implements ItemSerChangeLocal,It
 				{    
 					itemSer = genericUtility.getColumnValue("item_ser", dom);
 					
-					//if(itemSer != null && itemSer.trim().length() > 0)
-					//{
+					if(itemSer != null && itemSer.trim().length() > 0)
+					{
 						itemSerOld = genericUtility.getColumnValue("item_ser__old", dom);
 						sql = "select count(*) from itemser where item_ser = ?";
 						pstmt =  conn.prepareStatement(sql);
@@ -129,7 +129,7 @@ public class ItemSerChange extends ValidatorEJB implements ItemSerChangeLocal,It
 						rs = null;             
 						pstmt.close();
 						pstmt = null;
-					//}
+					}
 				}
 				else if(childNodeName.equalsIgnoreCase("eff_date"))
 				{    
@@ -145,12 +145,16 @@ public class ItemSerChange extends ValidatorEJB implements ItemSerChangeLocal,It
 						maxDate = getDateValue(rs.getDate("maxdate"));
 						System.out.println("Effective Date :"+effPdate);
 						System.out.println("Max Date :"+maxDate);
-						if( effPdate.before(maxDate)) 
-						{
-							errCode = "VTLVECD1";
-							errList.add(errCode);
-							errFields.add(childNodeName.toLowerCase());
-						}																
+					  if( effDate != null && maxDate != null )//Changed By Nasruddin 29-SEp-16
+					  {
+						  if( effPdate.before(maxDate)) 
+							{
+								errCode = "VTLVECD1";
+								errList.add(errCode);
+								errFields.add(childNodeName.toLowerCase());
+							} 
+					  }
+																						
 					}
 					rs.close();
 					rs = null;

webitm-dis/ibase/webitm/ejb/dis/SiteCustomer.java

@@ -381,26 +381,26 @@ public class SiteCustomer extends ValidatorEJB implements SiteCustomerLocal,Site
 				else if(childNodeName.equalsIgnoreCase("curr_code__ins"))
 				{
 					currCodeIns = genericUtility.getColumnValue("curr_code__ins", dom);
-					
-						sql = "select count(*) from currency  where curr_code = ?";
-						pstmt =  conn.prepareStatement(sql);
-						pstmt.setString(1,currCodeIns);
-						rs = pstmt.executeQuery();
-						if(rs.next())
-						{
-							count =  rs.getInt(1);
-						}
-						if(count == 0) 
-						{
-							errCode = "VECUR2";
-							errList.add(errCode);
-							errFields.add(childNodeName.toLowerCase());
-						}
-						rs.close();
-						rs = null;
-						pstmt.close();
-						pstmt = null;
+
+					sql = "select count(*) from currency  where curr_code = ?";
+					pstmt =  conn.prepareStatement(sql);
+					pstmt.setString(1,currCodeIns);
+					rs = pstmt.executeQuery();
+					if(rs.next())
+					{
+						count =  rs.getInt(1);
+					}
+					if(count == 0) 
+					{
+						errCode = "VECUR2";
+						errList.add(errCode);
+						errFields.add(childNodeName.toLowerCase());
 					}
+					rs.close();
+					rs = null;
+					pstmt.close();
+					pstmt = null;
+				}
 					
 			}//end of for
 

webitm-dis/ibase/webitm/ejb/dis/UnitConvIC.java

@@ -174,7 +174,7 @@ public class UnitConvIC extends ValidatorEJB implements UnitConvICLocal,UnitConv
 						   if("A".equals(editFlag))
 						   {
 							   itemCode = genericUtility.getColumnValue("item_code", dom);
-							   sql ="SELECT COUNT(1)  FROM UOMCONV 	WHERE UNIT__FR = ?	AND UNIT__TO = ?	AND ITEM_CODE = ?;";
+							   sql ="SELECT COUNT(1)  FROM UOMCONV 	WHERE UNIT__FR = ?	AND UNIT__TO = ?	AND ITEM_CODE = ?";
 							   pstmt = conn.prepareStatement(sql);
 							   pstmt.setString(1, unitFr);
 							   pstmt.setString(2, unitTo);