date format made proper in itemchange, in process unclosed connection closed

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

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

@@ -117,7 +117,7 @@ public class ReceiptExRefItmChg extends ValidatorEJB implements ReceiptExRefItmC
 					parentNode = parentNodeList.item(0);
 					childNodeList = parentNode.getChildNodes();
 					ctr = 0;
-					valueXmlString.append("<Detail1>");
+					valueXmlString.append("<Detail>");
 					int childNodeListLength = childNodeList.getLength();
 					do
 					{
@@ -178,22 +178,47 @@ public class ReceiptExRefItmChg extends ValidatorEJB implements ReceiptExRefItmC
 							valueXmlString.append("<tran_id>").append(tranId).append("</tran_id>\r\n");						
 							valueXmlString.append("<delivery_no_o>").append(disptNo).append("</delivery_no_o>\r\n");
 							valueXmlString.append("<delivery_no>").append(disptNo).append("</delivery_no>\r\n");
-							valueXmlString.append("<challan_date_o>").append(disptDate).append("</challan_date_o>\r\n");
-							valueXmlString.append("<challan_date>").append(disptDate).append("</challan_date>\r\n");
+							if (disptDate != null)
+							{
+								valueXmlString.append("<challan_date_o>").append(new SimpleDateFormat(genericUtility.getApplDateFormat()).format(disptDate)).append("</challan_date_o>\r\n");
+								valueXmlString.append("<challan_date>").append(new SimpleDateFormat(genericUtility.getApplDateFormat()).format(disptDate)).append("</challan_date>\r\n");
+							}
+							else
+							{
+								valueXmlString.append("<challan_date_o/>\r\n");
+								valueXmlString.append("<challan_date/>\r\n");
+							}
+							
 							valueXmlString.append("<invoice_no_o>").append(InvcNo).append("</invoice_no_o>\r\n");
 							valueXmlString.append("<invoice_no>").append(InvcNo).append("</invoice_no>\r\n");
-							valueXmlString.append("<invoice_date_o>").append(InvcDate).append("</invoice_date_o>\r\n");
-							valueXmlString.append("<invoice_date>").append(InvcDate).append("</invoice_date>\r\n");
+							if (InvcDate != null)
+							{
+								valueXmlString.append("<invoice_date_o>").append(new SimpleDateFormat(genericUtility.getApplDateFormat()).format(InvcDate)).append("</invoice_date_o>\r\n");
+								valueXmlString.append("<invoice_date>").append(new SimpleDateFormat(genericUtility.getApplDateFormat()).format(InvcDate)).append("</invoice_date>\r\n");
+							}
+							else
+							{
+								valueXmlString.append("<invoice_date_o/>\r\n");
+								valueXmlString.append("<invoice_date/>\r\n");
+							}
 							valueXmlString.append("<excise_ref_o>").append(exciseRef).append("</excise_ref_o>\r\n");
 							valueXmlString.append("<excise_ref>").append(exciseRef).append("</excise_ref>\r\n");
-							valueXmlString.append("<excise_date_o>").append(exciseRef).append("</excise_date_o>\r\n");
-							valueXmlString.append("<excise_date>").append(exciseRefDate).append("</excise_date>\r\n");
+							if (exciseRefDate != null)
+							{
+								valueXmlString.append("<excise_date_o>").append(new SimpleDateFormat(genericUtility.getApplDateFormat()).format(exciseRefDate)).append("</excise_date_o>\r\n");
+								valueXmlString.append("<excise_date>").append(new SimpleDateFormat(genericUtility.getApplDateFormat()).format(exciseRefDate)).append("</excise_date>\r\n");
+							}
+							else
+							{
+								valueXmlString.append("<excise_date_o/>\r\n");
+								valueXmlString.append("<excise_date/>\r\n");
+							}
 						}
 						
 						
 				    }//end of itm default	
 			}  				
-			valueXmlString.append("</Detail1>");
+			valueXmlString.append("</Detail>");
 		    valueXmlString.append("</Root>");	
 			
 		}//END OF TRY
@@ -205,8 +230,32 @@ public class ReceiptExRefItmChg extends ValidatorEJB implements ReceiptExRefItmC
 		}
 		finally
 		{
+			try
+			{
+			
+				if (rs != null)
+				{
+					rs.close();
+					rs = null;
+				}
+				if (pstmt != null)
+				{
+					pstmt.close();
+					pstmt = null;
+				}
+				if (conn != null)
+				{
+					conn.close();
+					conn = null;
+				}
+			}
+			catch(Exception e)
+			{
+				e.printStackTrace();
+				throw new ITMException(e);
+			}
 		}
-		System.out.println("valueXmlString>>>>>>>>>>>"+valueXmlString);
+		System.out.println("valueXmlString["+valueXmlString.toString() + "]");
 		return valueXmlString.toString();
 	 }//END OF ITEMCHANGE			
  }// END OF MAIN CLASS
\ No newline at end of file

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

@@ -364,6 +364,33 @@ public class ReceiptExRefPrc extends ProcessEJB implements ReceiptExRefPrcLocal,
 			  errString = e.getMessage();
 			
 		}
+		finally
+		{
+			try
+			{
+			
+				if (rs != null)
+				{
+					rs.close();
+					rs = null;
+				}
+				if (pstmt != null)
+				{
+					pstmt.close();
+					pstmt = null;
+				}
+				if (conn != null)
+				{
+					conn.close();
+					conn = null;
+				}
+			}
+			catch(Exception e)
+			{
+				e.printStackTrace();
+				throw new ITMException(e);
+			}
+		}
 
 		System.out.println("returning from  ImportDataPrcEJB   "+errString);
 	    return (errString);