Merge updated code

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

webitm-gst-client/ibase/webitm/ejb/gstclient/RcpAdvTaxCalulationProIC.java

@@ -57,7 +57,7 @@ public class RcpAdvTaxCalulationProIC extends ValidatorEJB implements RcpAdvTaxC
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
 		String sql="";
-		ConnDriver connDriver = new ConnDriver();
+		ConnDriver connDriver = null;
 		java.util.Date currDate = new java.util.Date(System.currentTimeMillis());
 		String dateStr = "";
 		String descr = "",currcode = "",currdescr="";
@@ -68,6 +68,10 @@ public class RcpAdvTaxCalulationProIC extends ValidatorEJB implements RcpAdvTaxC
 		E12GenericUtility genericUtility = new E12GenericUtility();
 		try{
               conn = getConnection();
+			   /*connDriver = new ConnDriver();
+			   conn = connDriver.getConnectDB("DriverITM");
+			   conn.setAutoCommit(false);
+	           connDriver = null;*/
 			connDriver = null;
 			FinCommon finCommon = new FinCommon();
 			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());

webitm-gst-client/ibase/webitm/ejb/gstclient/RcpAdvTaxcalcConf.java

@@ -82,6 +82,7 @@ public class RcpAdvTaxcalcConf extends ActionHandlerEJB implements RcpAdvTaxcalc
 			{
 				connDriver = new ConnDriver();
 				//conn = connDriver.getConnectDB("DriverITM");
+				
 				conn = getConnection();
 				System.out.println("Connection[" + conn + "]");
 				connDriver = null;

webitm-gst-client/ibase/webitm/ejb/gstclient/RcpAdvTaxcalcIC.java

@@ -94,10 +94,15 @@ public class RcpAdvTaxcalcIC extends ValidatorEJB
 		ResultSet rs = null;
 		E12GenericUtility genericUtility = new E12GenericUtility();
 		StringBuffer errStringXml = new StringBuffer("<?xml version = \"1.0\"?> \r\n <Root> <Errors>"); 
+		ConnDriver connDriver =null;
 		try
 		{
 
 			conn = getConnection();
+/*		    connDriver = new ConnDriver();
+			conn = connDriver.getConnectDB("DriverITM");
+			conn.setAutoCommit(false);
+			connDriver = null;*/
 			userId = getValueFromXTRA_PARAMS(xtraParams, "loginCode");
 			if(objContext != null && objContext.trim().length() > 0)
 			{
@@ -660,6 +665,7 @@ public class RcpAdvTaxcalcIC extends ValidatorEJB
 		PreparedStatement pstmt = null;
 		ResultSet rs = null ;
 		E12GenericUtility genericUtility = new E12GenericUtility();
+		ConnDriver connDriver =null;
 		//Added
 		System.out.println("Dom"+dom);
 		System.out.println( "dom1"+dom1);
@@ -669,6 +675,11 @@ public class RcpAdvTaxcalcIC extends ValidatorEJB
 		{
 			
 			conn = getConnection();
+		    /*connDriver = new ConnDriver();
+			conn = connDriver.getConnectDB("DriverITM");
+			conn.setAutoCommit(false);
+			connDriver = null;*/
+			
 			this.finCommon = new FinCommon();
 			if ((objContext != null) && (objContext.trim().length() > 0))
 			{