Done changes in finally and else block to resolve issues related to close...

Done changes in finally and else block to resolve issues related to close connection/statement on 13NOV2017

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

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

@@ -1888,7 +1888,22 @@ public class DistCommon
 									throw new ITMException(e);
 								}
 							}//if
-						}// end of loop 						
+						}// end of loop 
+						//Added by sarita on 13NOV2017
+						else
+						{
+							if(rs != null)
+							{
+								rs.close();
+								rs = null;
+							}
+							if(pstmt != null)
+							{
+								pstmt.close();
+								pstmt = null;
+							}
+						}
+						
 						//rs.close();
 					}//try 2
 					catch(Exception e)
@@ -1897,6 +1912,21 @@ public class DistCommon
 						e.printStackTrace();
 						throw new ITMException(e);
 					}
+					//Added by sarita on 13-11-2017 [start]
+					finally
+					{
+						if(rs != null)
+						{
+							rs.close();
+							rs = null;
+						}
+						if(pstmt != null)
+						{
+							pstmt.close();
+							pstmt = null;
+						}
+					}
+					//Added by sarita on 13-11-2017 [end]
 				}//else
 				//rs.close();
 			}//try 1
@@ -4692,8 +4722,11 @@ public class DistCommon
 							priceListParent = rs2.getString(1);
 							//System.out.println("The priceListParent is .... "+priceListParent);
 						}
-						rs.close();
-						rs = null;
+						//Commented and Added by sarita on 13NOV2017
+						/*rs.close();
+						rs = null;*/
+						rs2.close();
+						rs2 = null;
 						pstmt.close();
 						pstmt = null;
 						if((priceListParent == null) || (priceListParent.trim().length() == 0))
@@ -8922,14 +8955,42 @@ public class DistCommon
 									throw new ITMException(e);
 								}
 							}
-						} 						
-
+						}
+						//Added by sarita on 13NOV2017
+						else
+						{
+							if(rs != null)
+							{
+								rs.close();
+								rs = null;
+							}
+							if(pstmt != null)
+							{
+								pstmt.close();
+								pstmt = null;
+							}						
+						}
 					}
 					catch(Exception e)
 					{
 						e.printStackTrace();
 						throw new ITMException(e);
 					}
+					//Added by sarita on 13NOV2017[start]
+					finally
+					{
+						if(rs != null)
+						{
+							rs.close();
+							rs = null;
+						}
+						if(pstmt != null)
+						{
+							pstmt.close();
+							pstmt = null;
+						}						
+					}
+					//Added by sarita on 13NOV2017[end]
 				}
 
 			}
@@ -9754,14 +9815,41 @@ public class DistCommon
 									throw new ITMException(e);
 								}
 							}
-						} 						
-
+						} 	
+						//Added by sarita on 13NOV2017
+						else
+						{
+							if(rs != null)
+							{
+								rs.close();
+								rs = null;
+							}
+							if(pstmt != null)
+							{
+								pstmt.close();
+								pstmt = null;
+							}							
+						}
 					}
 					catch(Exception e)
 					{
 						e.printStackTrace();
 						throw new ITMException(e);
 					}
+					//Added by sarita on 13NOV2017
+					finally
+					{
+						if(rs != null)
+						{
+							rs.close();
+							rs = null;
+						}
+						if(pstmt != null)
+						{
+							pstmt.close();
+							pstmt = null;
+						}				
+					}
 				}
 
 			}