result set close

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

webitm-wms/ibase/webitm/ejb/wms/MultiplePtcnWizConf.java

@@ -261,9 +261,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 					updateRowMap.put("rate",Double.toString(stkRate));
 					updateRowMap.put("gross_rate",Double.toString(stkGrossRate));
 					updateRowMap.put("tran_id", tranId );					
-					// 17/10/11 manoharan
 					updateRowMap.put("line_no", "" + lineNo );					
-					// end 17/10/11 manoharan
 					updateRowMap.put("tran_date", tranDate );
 					updateRowMap.put("tran_type","ID"); 
 
@@ -726,19 +724,19 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 					if(isUpdatehdr)
 					{								
 						sql = "SELECT REF_SER,PTCN FROM WAVE_TASK_DET WHERE REF_ID = ?";
-								pstmt = conn.prepareStatement(sql);
-								pstmt.setString(1,replOrder);
-								rs = pstmt.executeQuery();
-								if( rs.next() )
+						pstmt1 = conn.prepareStatement(sql);
+						pstmt1.setString(1,replOrder);
+						rs1 = pstmt.executeQuery();
+						if( rs1.next() )
 						{
-									refSer = rs.getString("ref_ser");
+							refSer = rs1.getString("ref_ser");
 							refSer =  refSer == null?"":refSer;
-									ptcn = rs.getString("ptcn");
+							ptcn = rs1.getString("ptcn");
 							ptcn = ptcn == null?"":ptcn;
 						}
 						System.out.println(" ref_ser ["+refSer+"]");
-								rs.close();rs = null;
-								pstmt.close();pstmt = null;
+						rs1.close();rs1 = null;
+						pstmt1.close();pstmt1 = null;
 
 						if(!("A".equalsIgnoreCase(pickType)) && !"P-PICK".equalsIgnoreCase(refSer) && !"A-PICK".equalsIgnoreCase(refSer) )
 						{
@@ -808,14 +806,13 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 
 
 						System.out.println("Header updated successfully");
-										ConsolidatToDoc conToDoc = new ConsolidatToDoc();
-										
+						/*ConsolidatToDoc conToDoc = new ConsolidatToDoc();
 						retString = conToDoc.process(ptcn, conn,xtraParams);
 						if (retString != null && retString.trim().length() > 0 )
 						{
 							isError = true;
 							return retString;
-										}
+						}*/
 						System.out.println("ret string :"+retString);			
 
 					}
@@ -872,7 +869,22 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 			e.printStackTrace();
 			throw new Exception (e);			
 		}
-		
+		finally
+		{
+			if(isError)
+			{
+				conn.rollback();
+			}
+			else
+			{
+				conn.commit();
+			}
+			if(conn != null)
+			{
+				conn.close();
+				conn = null;
+			}
+		}
 		return errorString;
 
 	}
@@ -1002,6 +1014,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 		}
 		catch(Exception e)
 		{
+			isError = true;
 			throw e;
 		}
 		return "Error";
@@ -1164,6 +1177,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 		}
 		catch(Exception e)
 		{
+			isError = true;
 			throw e;
 		}
 		if(successCnt > 1)
@@ -1311,6 +1325,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 		}
 		catch(Exception e)
 		{
+			isError = true;
 			e.printStackTrace();
 			throw new ITMException(e);
 		}		
@@ -1465,6 +1480,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
         }
         catch(Exception e)
         {
+        	isError = true;
             e.printStackTrace();
             throw new ITMException(e);
         }