Skip to content

B
business-java
Commit 7b303039 authored by manohar's avatar manohar
Browse files
Options

changes related connection closing in various components 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91079 ce508802-f39f-4f6c-b175-0d175dae99d5
parent cff214cb
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 30 deletions
webitm-sys/ibase/webitm/ejb/sys/GenVal.java
View file @ 7b303039
......@@ -10,9 +10,10 @@ import ibase.webitm.ejb.*;
import ibase.webitm.utility.GenericUtility;
import ibase.utility.CommonConstants;
import ibase.system.config.*;
import ibase.system.config.ConnDriver;
public class GenVal
{
Connection conn = null;
GenericUtility genericUtility = GenericUtility.getInstance();
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
......@@ -30,11 +31,13 @@ public class GenVal
String logDirName = "";
//end added by msalam on 22/11/07 for appending log in jboss log
public String genVal(String modName ,String objContext,Document data ,Connection conn)
//public String genVal(String modName ,String objContext,Document data ,Connection conn)
public String genVal(String modName ,String objContext,Document data )
{
//System.out.println("Generalized Validation Is In Process.************************************.......");
Statement stmt = null;
ResultSet rs = null;
Connection conn = null;
String fldName ="",valType = "",fldMin = "",sqlInput = "",fldMax = "",errCD = "",blankOpt = "",fldData ="",fldType="";
String errCode ="";
String sql = " SELECT FLD_NAME,VAL_TYPE,FLD_MIN,SQL_INPUT,FLD_MAX,ERROR_CD,BLANK_OPT ,FLD_TYPE FROM GENMST WHERE MOD_NAME= '"+modName.toUpperCase()+"'";
......@@ -42,6 +45,10 @@ public class GenVal
String errMsg =" ";
try
{
ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM");
connDriver = null;
stmt = conn.createStatement();
rs = stmt.executeQuery(sql);
while (rs.next())
......@@ -77,7 +84,8 @@ public class GenVal
//cross query validation
if (valType.equalsIgnoreCase("Q"))
{
errMsg = genVal( fldName, modName, data, objContext, fldMin, sqlInput, fldMax, errCD, conn );
//***errMsg = genVal( fldName, modName, data, objContext, fldMin, sqlInput, fldMax, errCD, conn );
errMsg = genVal( fldName, modName, data, objContext, fldMin, sqlInput, fldMax, errCD );
}
//slab validation
else if( valType.equalsIgnoreCase( "S" ) )
......@@ -139,7 +147,8 @@ public class GenVal
else if( valType.trim().equalsIgnoreCase("M") )
{
//System.out.println("Calling masterVal for module * * * * * [" + modName.trim() + "]");
errMsg = masterVal( fldName, modName, fldData, errCD, conn );
//***errMsg = masterVal( fldName, modName, fldData, errCD, conn );
errMsg = masterVal( fldName, modName, fldData, errCD );
}
//next line commented by msalam on 22/11/07 as validation is required on fldData blank also
}//end of blank opt N
......@@ -151,11 +160,22 @@ public class GenVal
break;
}
}
if(errMsg.trim().length()==0 && xFlag == true)
rs.close();
rs = null;
stmt.close();
stmt = null;
if (conn != null)
{
conn.close();
conn = null;
}
if(errMsg.trim().length()==0 && xFlag == true)
{
xFlag = false;
//System.out.println("Calling genVal for module * * * * * [X]");
errMsg = genVal("X",objContext,data ,conn);
//***errMsg = genVal("X",objContext,data ,conn);
errMsg = genVal("X",objContext,data );
xFlag = true;
}
} // end of try
......@@ -176,13 +196,15 @@ public class GenVal
{
try
{
if(stmt!=null)
if(rs !=null)
{
stmt=null;
rs.close();
rs=null;
}
if(rs !=null)
if(stmt!=null)
{
rs=null;
stmt.close();
stmt=null;
}
if (conn != null)
{
......@@ -204,7 +226,8 @@ public class GenVal
//changed by msalam on 26/09/07 start
//to overload the function
//public String genVal(String modName ,String objContext,Document data ,Connection conn)
public String genVal(String modName ,String objContext,Document data, String focusedRow, Connection conn)
//public String genVal(String modName ,String objContext,Document data, String focusedRow, Connection conn)
public String genVal(String modName ,String objContext,Document data, String focusedRow)
{
String errMsg =" ";
//changed by msalam on 26/09/07 start
......@@ -228,7 +251,8 @@ public class GenVal
//System.out.println("--------------------------------------->GenVal called");
writeLog( filePtr, "GenVal called", true );
//end changed by msalam on 22/11/07 for appending log
errMsg = genVal( modName, objContext, data, conn);
//***errMsg = genVal( modName, objContext, data, conn);
errMsg = genVal( modName, objContext, data);
return errMsg;
}
......@@ -267,15 +291,24 @@ public class GenVal
return result;
}
//master validation
private String masterVal( String fldName, String modName, String fldData, String errCD, Connection conn )
//private String masterVal( String fldName, String modName, String fldData, String errCD, Connection conn )
private String masterVal( String fldName, String modName, String fldData, String errCD )
{
String err = " ";
Statement mst = null;
ResultSet mrs = null;
Connection conn = null;
int count=0;
String sql ="";
writeLog( filePtr, "fldData:::::::::"+fldData, true );
try
{
ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM");
connDriver = null;
//System.out.println("fldData:::::::::"+fldData);
//next 2 lines commented by msalam on 23/11/07 as validation is required on fldData blank also
//if( fldData != null && fldData.trim().length()!=0 )
......@@ -291,19 +324,25 @@ public class GenVal
}
writeLog( filePtr, "Excecuting Query(valtype=M);:::::::::::::::"+sql, true );
//System.out.println("Excecuting Query(valtype=M);:::::::::::::::"+sql);
try
{
//try
//{
mst=conn.createStatement();
mrs = mst.executeQuery( sql );
if(mrs.next())
{
count = mrs.getInt(1);
}
mrs.close();
mrs = null;
mst.close();
mst = null;
if(count==0)
{
err = errCD;
writeLog( filePtr, "Master validation record Not Found", true );
}
conn.close();
conn = null;
}
catch(Exception e){e.printStackTrace();}
//next line commented by msalam on 22/11/07 as validation is required on fldData blank also
......@@ -314,7 +353,8 @@ public class GenVal
return err;
}
private String genVal( String fldName, String modName, Document dom, String objContext, String queryFrDB, String sqlInput, String resultStr, String errcd, Connection conn )
//private String genVal( String fldName, String modName, Document dom, String objContext, String queryFrDB, String sqlInput, String resultStr, String errcd, Connection conn )
private String genVal( String fldName, String modName, Document dom, String objContext, String queryFrDB, String sqlInput, String resultStr, String errcd )
{
//System.out.println( "Result Should come as " + resultStr );
writeLog( filePtr, "Result Should come as " + resultStr, true );
......@@ -327,6 +367,7 @@ public class GenVal
StringTokenizer st = null;
String data="";
String errCode =" ";
Connection conn = null;
String colType ="";
try
{
......@@ -471,6 +512,9 @@ public class GenVal
//Changed by msalam on 22/10/07 for colType = "DATETIME" end
}
}
ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM");
connDriver = null;
writeLog( filePtr, "After replace parameter Final Query[*********]:::" + QueryBuf.toString(), true );
pstmt1= conn.prepareStatement( QueryBuf.toString() );
rs1 = pstmt1.executeQuery();
......@@ -517,6 +561,12 @@ public class GenVal
dataVec.add( data );
}
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
conn.close();
conn = null;
for( int counter = 0; counter < resultStrVec.size(); counter++ )
{
String result = (String)resultStrVec.get( counter );
......
webitm-sys/ibase/webitm/ejb/sys/GenValidate.java
View file @ 7b303039
......@@ -35,11 +35,11 @@ public class GenValidate extends ValidatorEJB implements GenValidateLocal , Gen
{
Connection conn = null;
String sql = null;
PreparedStatement pstmt = null;
ResultSet rs = null;
GenVal genVal = new GenVal();
//Connection conn = null;
//String sql = null;
//PreparedStatement pstmt = null;
//ResultSet rs = null;
/* public void ejbCreate() throws RemoteException, CreateException
{
......@@ -64,15 +64,15 @@ public class GenValidate extends ValidatorEJB implements GenValidateLocal , Gen
public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String winName, String xtraParams) throws RemoteException
{
String finalStr = "";
String finalStr = "";
Document dom = null;
String userId="", errCode = "",resultString = "";
// finalStr = mergeXml(xmlString, xmlString1, xmlString2);
try
{
ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM");
connDriver = null;
//***ConnDriver connDriver = new ConnDriver();
//***conn = connDriver.getConnectDB("DriverITM");
//**connDriver = null;
//System.out.println("xmlString2 : " + xmlString2);
dom = parseString(xmlString2);
userId = getValueFromXTRA_PARAMS(xtraParams, "loginCode");
......@@ -80,11 +80,17 @@ public class GenValidate extends ValidatorEJB implements GenValidateLocal , Gen
//for passing current focused Row from xtraParams
String focusedRow = null;
focusedRow = getValueFromXTRA_PARAMS(xtraParams, "focusRow");
//System.out.println( "focusedRow :: " + focusedRow );
System.out.println( "winName :: " + winName );
System.out.println( "objContext :: " + objContext );
System.out.println( "focusedRow :: " + focusedRow );
System.out.println( "xmlString2 :: " + xmlString2 );
//errCode = genVal.genVal(winName,objContext,dom,conn);
errCode = genVal.genVal(winName,objContext,dom, focusedRow, conn);
//****errCode = genVal.genVal(winName,objContext,dom, focusedRow, conn);
GenVal genVal = new GenVal();
errCode = genVal.genVal(winName,objContext,dom, focusedRow);
genVal = null;
//changed by msalam on 27/09/07 end
if (errCode != null && errCode.trim().length() > 0)
if (errCode != null && errCode.trim().length() > 0)
{
resultString = getErrorString("", errCode, userId);
}
......@@ -99,7 +105,7 @@ public class GenValidate extends ValidatorEJB implements GenValidateLocal , Gen
{
e.printStackTrace();
}
finally
/*finally
{
try
{
......@@ -111,7 +117,7 @@ public class GenValidate extends ValidatorEJB implements GenValidateLocal , Gen
catch(Exception ex)
{ex.printStackTrace();}
}
}*/
return resultString;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment