FIX CHECKNULL FOR in site item change

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

webitm-fin/ibase/webitm/ejb/fin/ReceiptAdv.java

@@ -2184,6 +2184,11 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 							finEntity = rs.getString(2);
 							bankCode = rs.getString(3);
 						}
+						rs.close();
+						rs = null;
+						pstmt.close();
+						pstmt = null;
+						
 						sql = "select curr_code from bank where bank_code = ?";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1, bankCode);
@@ -2193,6 +2198,11 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 							currCode = rs.getString(1);
 							valueXmlString.append("<curr_code>").append("<![CDATA["+ currCode+"]]>").append("</curr_code>");
 						}
+						rs.close();
+						rs = null;
+						pstmt.close();
+						pstmt = null;
+						
 						sql = "select std_exrt  from currency where curr_code = ? ";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1, currCode);
@@ -2201,6 +2211,11 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 						{
 							stdExRt = rs.getInt(1);
 						}
+						rs.close();
+						rs = null;
+						pstmt.close();
+						pstmt = null;
+						
 						valueXmlString.append("<exch_rate protect = \"1\">").append("<![CDATA[" + stdExRt +"]]>").append("</exch_rate>");
 					}
 					sql = "select descr from finent where fin_entity = ?";
@@ -2235,11 +2250,18 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 						acctCodeCfAr = rs.getString(6);
 						cctrCodeCfAr = rs.getString(7);
 					}
+					
+					rs.close();
+					rs = null;
+					pstmt.close();
+					pstmt = null;
+					
+					
 					if ((acctCodeCfAr != null) && (acctCodeCfAr.trim().length() > 0))
 					{
 						acctCodeCf = acctCodeCfAr;
 					}
-					if ((cctrCodeCf != null) && (cctrCodeCfAr.trim().length() > 0))
+					if ((cctrCodeCfAr != null) && (cctrCodeCfAr.trim().length() > 0))
 					{
 						cctrCodeCf = cctrCodeCfAr;
 					}
@@ -2275,10 +2297,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 						}
 
 					}
-					pstmt.close();
-					pstmt = null;
-					rs.close();
-					rs = null;
+					
+					
 
 				}
 				else if (currentColumn.trim().equalsIgnoreCase("bank_code"))
@@ -2321,10 +2341,11 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 					{
 						valueXmlString.append("<entry_batch_no protect = \"1\">").append("<![CDATA[]]>").append("</entry_batch_no>");
 					}
-					pstmt.close();
-					pstmt = null;
 					rs.close();
 					rs = null;
+					pstmt.close();
+					pstmt = null;
+					
 
 				}
 
@@ -2348,6 +2369,13 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 						acctCodeAdv = rs.getString(7);
 						cctrCodeAdv = rs.getString(8);
 					}
+					
+					rs.close();
+					rs = null;
+					pstmt.close();
+					pstmt = null;
+					
+					
 					valueXmlString.append("<cust_name>").append("<![CDATA[" + custName + "]]>").append("</cust_name>");
 					valueXmlString.append("<acct_code__ar>").append("<![CDATA[" + acctCodeAr + "]]>").append("</acct_code__ar>");
 					valueXmlString.append("<cctr_code__ar>").append("<![CDATA[" + cctrCodeAr + "]]>").append("</cctr_code__ar>");
@@ -2382,6 +2410,12 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 					{
 						finEntity = rs.getString(1);
 					}
+					
+					rs.close();
+					rs = null;
+					pstmt.close();
+					pstmt = null;
+					
 					advAmt = Double.parseDouble(genericUtility.getColumnValue("adv_amt", dom));
 					if (advAmt == 0.0D)
 					{
@@ -2412,13 +2446,17 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 						{
 							sumAdvAmt = rs.getDouble(1);
 						}
-						sumAdvAmt *= -1.0D;
-						valueXmlString.append("<CFC_REMARKS >").append("<![CDATA[" + sumAdvAmt + "]]>").append("</CFC_REMARKS>");
-					}
+						
 						rs.close();
 						rs = null;
 						pstmt.close();
 						pstmt = null;
+						
+						sumAdvAmt *= -1.0D;
+						valueXmlString.append("<CFC_REMARKS >").append("<![CDATA[" + sumAdvAmt + "]]>").append("</CFC_REMARKS>");
+					}
+				
+					
 					setNodeValue(dom, "curr_code", getAbsString(currCode));
 				}
 
@@ -2442,6 +2480,12 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 						{
 							CurrCode = rs.getString(1);
 						}
+						rs.close();
+						rs = null;
+						pstmt.close();
+						pstmt = null;
+						
+						
 						if (currCode.trim().equals(CurrCode.trim()))
 						{
 							valueXmlString.append("<exch_rate protect = \"1\">").append("<![CDATA[" + mexchrate + "]]>").append("</exch_rate>");
@@ -2455,6 +2499,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 					{
 						valueXmlString.append("<exch_rate_spot>").append("<![CDATA[" + mexchrate + "]]>").append("</exch_rate_spot>");
 					}
+					
 					sql = "select std_exrt  from currency where curr_code = ? ";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, currCode);
@@ -2465,10 +2510,12 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 					}
 					valueXmlString.append("<exch_rate protect = \"1\">").append("<![CDATA[" + stdExRt +"]]>").append("</exch_rate>");
 					valueXmlString.append("<exch_rate_spot protect = \"0\">").append("<![CDATA[" + stdExRt + "]]>").append("</exch_rate_spot>");
-					pstmt.close();
-					pstmt = null;
+					
 					rs.close();
 					rs = null;
+					pstmt.close();
+					pstmt = null;
+					
 				}
 				else if (currentColumn.trim().equalsIgnoreCase("chq_amt"))
 				{
@@ -2510,10 +2557,11 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 						valueXmlString.append("<curr_code protect = \"1\">").append("<![CDATA[" + CurrCodeFrom + "]]>").append("</curr_code>");
 						valueXmlString.append("<exch_rate protect = \"1\" >").append("<![CDATA[" + exchRate + "]]>").append("</exch_rate>");
 					}
-					pstmt.close();
-					pstmt = null;
 					rs.close();
 					rs = null;
+					pstmt.close();
+					pstmt = null;
+					
 				}
 				valueXmlString.append("</Detail1>");
 				break;