Connection is passed as parameter

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

webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptAdvConf.java

@@ -32,7 +32,29 @@ import javax.ejb.Stateless;
 @Stateless
 public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLocal,ReceiptAdvConfRemote 
 {
-	public String confirm(String tranId,String xtraParams,String forcedFlag) throws RemoteException,ITMException
+	public String confirm(String tranID,String xtraParams, String forcedFlag) throws RemoteException,ITMException
+	{
+		String retString = "";
+		boolean isConn= false;
+		Connection conn = null;
+
+		try
+		{
+			retString = confirm( tranID, xtraParams, forcedFlag, conn );
+
+			if ( retString != null && retString.length() > 0 )
+			{
+				throw new Exception("Exception while calling confirm for tran  Id:["+tranID+"]");
+			}
+		}
+		catch(Exception exception)
+		{
+			System.out.println("Exception in [InvHoldConfEJB] getCurrdateAppFormat " + exception.getMessage());
+		}
+		return retString;
+	}
+	
+	public String confirm(String tranId,String xtraParams,String forcedFlag, Connection conn) throws RemoteException,ITMException
 	{
 		System.out.println("confirm called........");
 		String sql = "";
@@ -41,8 +63,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 		String errString = "" ;
 		String tranSer = "";
 		String loginEmpCode = "";
-		Connection conn = null;
-		ConnDriver connDriver = null;
+		//Connection conn = null;
+		//ConnDriver connDriver = null;
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
 		FinCommon finCommon = null;
@@ -50,16 +72,26 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 		ITMDBAccessEJB itmDBAccessEJB = null;
 		ValidatorEJB validatorEJB = null;
 		System.out.println("tran id = "+tranId);
+		boolean connStatus=false;
 		try
 		{
+			if ( conn == null )//changed by Gulzar - 25/11/11
+			{
+				ConnDriver connDriver = null;
+				connDriver = new ConnDriver();
+				conn = connDriver.getConnectDB("DriverITM");
+				conn.setAutoCommit(false);
+				connDriver = null;
+				connStatus = true;
+			}
 			finCommon = new FinCommon();
 			genericUtility = new GenericUtility();
 			itmDBAccessEJB = new ITMDBAccessEJB();
 			validatorEJB = new ValidatorEJB();
-			connDriver = new ConnDriver();
-			conn = connDriver.getConnectDB("DriverITM");
-			connDriver = null;
-			conn.setAutoCommit(false);
+			//connDriver = new ConnDriver();
+			//conn = connDriver.getConnectDB("DriverITM");
+			//connDriver = null;
+			//conn.setAutoCommit(false);
 			loginEmpCode = validatorEJB.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
 
 			sql = "select confirmed ,site_code  from receipt where tran_id = ?";
@@ -156,11 +188,13 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 		}
 		finally
 		{
-			if(conn!=null)
-			{
+			
 				try
 				{
+					
 					if(errString != null && errString.trim().length() > 0)
+					{
+						if( conn != null && !conn.isClosed() && connStatus ) 
 						{
 							if(errString.indexOf("VTCICONF3") > -1)
 							{
@@ -170,6 +204,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 							{
 								conn.rollback();
 							}
+							conn.close();
+							conn = null;
+						}
 					}
 					if(rs != null)
 					{
@@ -181,14 +218,14 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 						pstmt.close();
 						pstmt = null;
 					}
-					conn.close();
+					//conn.close();
 				}
 				catch(Exception e)
 				{
 					System.out.println("Exception : "+e);e.printStackTrace();
 					throw new ITMException(e);
 				}
-			}
+			
 		}
 		return errString;
 	} //end of confirm method
@@ -2265,7 +2302,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 			netAmountBc = (double) Double.parseDouble( "" + RcpHdrMap.get("net_amt__bc"));
 			acctCodeCf = (String)RcpHdrMap.get("acct_code__cf");
 			rcpMode = (String)RcpHdrMap.get("rcp_mode");
-
+			//Added by Manoj dtd 09/12/2013 to set Accound code Adv and cctrCode Adv
+			acctCode=(String)RcpHdrMap.get("acct_code__adv");
+			cctrCode=(String)RcpHdrMap.get("cctr_code__adv");
 			//added by akhilesh on 31/july/13 for tax provision
 
 			sql =" select case when sum(tax_amt) is null then 0 else sum(tax_amt) end as taxAmt "

webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptAdvConfLocal.java

@@ -8,10 +8,13 @@ package ibase.webitm.ejb.fin.adv;
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.ejb.*;
 import java.rmi.RemoteException;
+import java.sql.Connection;
+
 import javax.ejb.Local; 
 @Local 
 public interface ReceiptAdvConfLocal extends ActionHandlerLocal 
 {
 	public String confirm(String tranID, String xtraParams, String forcedFlag) throws RemoteException,ITMException;
+	public String confirm( String tranId, String xtraParams,String forcedFlag, Connection conn ) throws RemoteException,ITMException;
 }
 

webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptAdvConfRemote.java

@@ -8,9 +8,12 @@ package ibase.webitm.ejb.fin.adv;
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.ejb.*;
 import java.rmi.RemoteException;
+import java.sql.Connection;
+
 import javax.ejb.Remote; 
 @Remote 
 public interface ReceiptAdvConfRemote extends ActionHandlerRemote
 {
 	public String confirm(String tranID, String xtraParams, String forcedFlag) throws RemoteException,ITMException;
+	public String confirm( String tranId, String xtraParams,String forcedFlag, Connection conn) throws RemoteException,ITMException;
 }