bug fixing null date handling

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

webitm-dis/ibase/webitm/ejb/dis/adv/PReturnAct.java

@@ -149,9 +149,23 @@ public class PReturnAct extends ActionHandlerEJB implements PReturnActLocal, PRe
 				valueXmlString.append("<batch_no isSrvCallOnChg='0'>").append("<![CDATA[" +checkNull(rs.getString("batch_no"))+ "]]>").append("</batch_no>");
 				smfgDate = (rs.getTimestamp("mfg_date")!=null)?(sdf.format(rs.getTimestamp("mfg_date")).toString()):"";
 				sexpiryDate =(rs.getTimestamp("expiry_date")!=null)?(sdf.format(rs.getTimestamp("expiry_date")).toString()):"";
+				if (smfgDate != null && smfgDate.trim().length() > 0)
+				{
 					valueXmlString.append("<mfg_date isSrvCallOnChg='0'>").append("<![CDATA[" +smfgDate+ "]]>").append("</mfg_date>");
-				valueXmlString.append("<expiry_date isSrvCallOnChg='0'>").append("<![CDATA[" +sexpiryDate+ "]]>").append("</expiry_date>");
+				}
+				else
+				{
+					valueXmlString.append("<mfg_date isSrvCallOnChg='0'/>");
+				}
 
+				if (sexpiryDate != null && sexpiryDate.trim().length() > 0)
+				{
+					valueXmlString.append("<expiry_date isSrvCallOnChg='0'>").append("<![CDATA[" +sexpiryDate+ "]]>").append("</expiry_date>");
+				}
+				else
+				{
+					valueXmlString.append("<expiry_date isSrvCallOnChg='0'>");
+				}
 				//valueXmlString.append("<status>").append("<![CDATA[" +checkNull(rs.getString("status"))+ "]]>").append("</status>");
 				//valueXmlString.append("<vouch_qty>").append("<![CDATA[" +rs.getDouble("vouch_qty")+ "]]>").append("</vouch_qty>");
 				valueXmlString.append("<gross_weight isSrvCallOnChg='0'>").append("<![CDATA[" +rs.getDouble("gross_weight")+ "]]>").append("</gross_weight>");
@@ -192,7 +206,14 @@ public class PReturnAct extends ActionHandlerEJB implements PReturnActLocal, PRe
 				valueXmlString.append("<form_no isSrvCallOnChg='0'>").append("<![CDATA[" +checkNull(rs.getString("form_no"))+ "]]>").append("</form_no>");
 				
 				sretestDate = (rs.getTimestamp("retest_date")!=null)?(sdf.format(rs.getTimestamp("retest_date")).toString()):"";
+				if (sretestDate != null && sretestDate.trim().length() > 0)
+				{
 					valueXmlString.append("<retest_date isSrvCallOnChg='0'>").append("<![CDATA[" +sretestDate+ "]]>").append("</retest_date>");
+				}
+				else
+				{
+					valueXmlString.append("<retest_date isSrvCallOnChg='0'/>");
+				}
 				valueXmlString.append("<duty_paid isSrvCallOnChg='0'>").append("<![CDATA[" +checkNull(rs.getString("duty_paid"))+ "]]>").append("</duty_paid>");
 				valueXmlString.append("<batch_size isSrvCallOnChg='0'>").append("<![CDATA[" +checkNull(rs.getString("batch_size"))+ "]]>").append("</batch_size>");
 				valueXmlString.append("<sample_qty isSrvCallOnChg='0'>").append("<![CDATA[" +checkNull(rs.getString("sample_qty"))+ "]]>").append("</sample_qty>");