Change in validation

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

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

@@ -1437,7 +1437,7 @@ implements CustomerLocal, CustomerRemote
 					{
 						regCode = this.genericUtility.getColumnValue("reg_code", dom);
 
-						if (regCode != null && regCode.trim().length()>0)
+						if (regCode != null && regCode.trim().length() > 0)
 						{
 							cnt = 0;
 							sql = "select count(*) as cnt from reg_requirements where reg_code=?";
@@ -1468,7 +1468,7 @@ implements CustomerLocal, CustomerRemote
 					} else if (childNodeName.trim().equalsIgnoreCase("reg_date"))
 					{
 						regDate = this.genericUtility.getColumnValue("reg_date", dom);
-						if (regDate == null || regDate.trim().length() <= 0)
+						if (regDate == null)
 						{
 							errCode = "VTREGNULL";
 							errList.add(errCode);
@@ -1478,13 +1478,15 @@ implements CustomerLocal, CustomerRemote
 					{
 						validUpto = this.genericUtility.getColumnValue("valid_upto", dom);
 						regDate = this.genericUtility.getColumnValue("reg_date", dom);
-
-						if (validUpto != null)
+						if (validUpto == null)
+						{
+							errCode = "VTVALNULL";
+							errList.add(errCode);
+							errFields.add(childNodeName.toLowerCase());
+						} else if (regDate != null)
 						{
-							Timestamp validUptoDate = Timestamp.valueOf(genericUtility.getValidDateString(validUpto,
-									genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
-							Timestamp regDateNew = Timestamp.valueOf(genericUtility.getValidDateString(regDate,
-									genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
+							Timestamp validUptoDate = Timestamp.valueOf(genericUtility.getValidDateString(validUpto, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
+							Timestamp regDateNew = Timestamp.valueOf(genericUtility.getValidDateString(regDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
 
 							if (validUptoDate.compareTo(regDateNew) <= 0)
 							{
@@ -1492,11 +1494,6 @@ implements CustomerLocal, CustomerRemote
 								errList.add(errCode);
 								errFields.add(childNodeName.toLowerCase());
 							}
-						} else
-						{
-							errCode = "VTVALNULL";
-							errList.add(errCode);
-							errFields.add(childNodeName.toLowerCase());
 						}
 					}
 				}