prepared statement to be closed

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

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

@@ -4322,8 +4322,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 						pstmt.setString(1, dlvCity);
 						rs = pstmt.executeQuery();
 						if (rs.next()) {
-							state = rs.getString("state_code");
-							countryCode = rs.getString("count_code");
+							state = checkNull(rs.getString("state_code"));
+							countryCode = checkNull(rs.getString("count_code"));
 
 						}
 						
@@ -4354,7 +4354,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 						pstmt.setString(1, mget1);
 						rs = pstmt.executeQuery();
 						if (rs.next()) {
-							lsTerrdescr = rs.getString("descr");
+							lsTerrdescr = checkNull(rs.getString("descr"));
 						}
 						rs.close();
 						rs = null;
@@ -4381,8 +4381,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 					pstmt.setString(1, lsOrderType);
 					rs = pstmt.executeQuery();
 					if (rs.next()) {
-						descr = rs.getString("descr");
-						lsAvailableYn = rs.getString("available_yn");
+						descr = checkNull(rs.getString("descr"));
+						lsAvailableYn = checkNull(rs.getString("available_yn"));
 					}
 					rs.close();
 					rs = null;
@@ -8118,10 +8118,10 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 					if (rs.next()) {
 						descr = rs.getString("descr");
 					}
-					pstmt.close();
-					pstmt = null;
 					rs.close();
 					rs = null;
+					pstmt.close();
+					pstmt = null;
 
 					valueXmlString.append("<station_descr>").append("<![CDATA[" + descr + "]]>")
 							.append("</station_descr>");
@@ -8137,10 +8137,10 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 						descr1 = rs.getString("descr1");
 						mcurr = rs.getString("mcurr");
 					}
-					pstmt.close();
-					pstmt = null;
 					rs.close();
 					rs = null;
+					pstmt.close();
+					pstmt = null;
 
 					valueXmlString.append("<tran_name>").append("<![CDATA[" + descr + "]]>").append("</tran_name>");
 					setNodeValue(dom, "tran_name", getAbsString(descr));
@@ -8174,10 +8174,10 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 					if (rs.next()) {
 						lsPlistOrderType = rs.getString("ls_plist_ordertype");
 					}
-					pstmt.close();
-					pstmt = null;
 					rs.close();
 					rs = null;
+					pstmt.close();
+					pstmt = null;
 
 					if ((lsOrderType.equalsIgnoreCase("NE") && lsPlistOrderType.equalsIgnoreCase("NE"))
 							|| (!lsOrderType.equalsIgnoreCase("NE") && lsPlistOrderType == null)) {
@@ -8194,10 +8194,10 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 						if (rs.next()) {
 							lsPlistClg = checkNull(rs.getString("price_list__clg"));
 						}
-						pstmt.close();
-						pstmt = null;
 						rs.close();
 						rs = null;
+						pstmt.close();
+						pstmt = null;
 					}
 					if (lsPlistClg == null || lsPlistClg.trim().length() == 0) {
 						sql = "select price_list__clg from customer where  cust_code =  ?";
@@ -8207,10 +8207,10 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 						if (rs.next()) {
 							lsPlistClg = checkNull(rs.getString("price_list__clg"));
 						}
-						pstmt.close();
-						pstmt = null;
 						rs.close();
 						rs = null;
+						pstmt.close();
+						pstmt = null;
 					}
 
 					if (lsPlistClg == null || lsPlistClg.trim().length() == 0) {
@@ -8245,10 +8245,10 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 					if (rs.next()) {
 						lsMarketReg = rs.getString("market_reg");
 					}
-					pstmt.close();
-					pstmt = null;
 					rs.close();
 					rs = null;
+					pstmt.close();
+					pstmt = null;
 					if (lsMarketReg == null || lsMarketReg.trim().length() == 0) {
 						sql = "select market_reg from customer where  cust_code = ?";
 						pstmt = conn.prepareStatement(sql);
@@ -8257,10 +8257,10 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 						if (rs.next()) {
 							lsMarketReg = rs.getString("market_reg");
 						}
-						pstmt.close();
-						pstmt = null;
 						rs.close();
 						rs = null;
+						pstmt.close();
+						pstmt = null;
 					}
 					if (lsMarketReg != null && lsMarketReg.trim().length() > 0) {
 						valueXmlString.append("<market_reg>").append("<![CDATA[" + lsMarketReg + "]]>")
@@ -8275,10 +8275,10 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 					if (rs.next()) {
 						lsEmailAddr = rs.getString("email_addr");
 					}
-					pstmt.close();
-					pstmt = null;
 					rs.close();
 					rs = null;
+					pstmt.close();
+					pstmt = null;
 					valueXmlString.append("<email_addr>").append("<![CDATA[" + lsEmailAddr + "]]>")
 							.append("</email_addr>");
 					setNodeValue(dom, "email_addr", getAbsString(lsEmailAddr));
@@ -8291,10 +8291,10 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 					if (rs.next()) {
 						lsDlvTerm = rs.getString("dlv_term");
 					}
-					pstmt.close();
-					pstmt = null;
 					rs.close();
 					rs = null;
+					pstmt.close();
+					pstmt = null;
 					if (lsDlvTerm == null || lsDlvTerm.trim().length() == 0) {
 						sql = "select dlv_term from   customer where  cust_code =?";
 						pstmt = conn.prepareStatement(sql);
@@ -8303,10 +8303,10 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 						if (rs.next()) {
 							lsDlvTerm = rs.getString("dlv_term");
 						}
-						pstmt.close();
-						pstmt = null;
 						rs.close();
 						rs = null;
+						pstmt.close();
+						pstmt = null;
 					}
 					if (lsDlvTerm == null || lsDlvTerm.trim().length() == 0) {
 						lsDlvTerm = "NA";