Skip to content

B
business-java
Commit fc17e072 authored by cshah's avatar cshah
Browse files
Options

changes done for conn 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91472 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 2c9a8502
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 29 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/JvConfirm.java
View file @ fc17e072
...@@ -71,6 +71,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -71,6 +71,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
else else
{ {
errString = this.gbfRetrieveJournal(tranId,xtraParams,conn); errString = this.gbfRetrieveJournal(tranId,xtraParams,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
} }
} //end of try } //end of try
catch(Exception e) catch(Exception e)
...@@ -82,6 +86,14 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -82,6 +86,14 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
{ {
try try
{ {
if(errString != null && errString.trim().length() > 0)
{
conn.rollback();
}
else
{
conn.commit();
}
if(rs != null) if(rs != null)
{ {
rs.close(); rs.close();
...@@ -313,12 +325,19 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -313,12 +325,19 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
{ {
System.out.println("call for normal site"); System.out.println("call for normal site");
errString = this.gbfPostJournal(tranId,journalMap, jourdetList, xtraParams, conn); errString = this.gbfPostJournal(tranId,journalMap, jourdetList, xtraParams, conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
} }
else else
{ {
System.out.println("call for other site"); System.out.println("call for other site");
errString = this.otherSitePostJournal( tranId,journalMap, jourdetList, xtraParams, conn); errString = this.otherSitePostJournal( tranId,journalMap, jourdetList, xtraParams, conn);
System.out.println("errString is : : : : : "+errString); if(errString != null && errString.trim().length() > 0)
{
return errString;
}
} }
} }
rs.close(); rs.close();
...@@ -361,12 +380,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -361,12 +380,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
jourdetMap.clear(); jourdetMap.clear();
if(rs != null){rs.close();rs = null;} if(rs != null){rs.close();rs = null;}
if(pstmt != null){pstmt.close();pstmt = null;} if(pstmt != null){pstmt.close();pstmt = null;}
if(conn != null)
{
conn.close();
conn = null;
}
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -470,7 +483,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -470,7 +483,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
return errString; return errString;
} }
//if((!("O".equalsIgnoreCase (detSundryType))) || (detSundryCode!= null))
if(!("O".equalsIgnoreCase (detSundryType)) && (detSundryCode == null)) if(!("O".equalsIgnoreCase (detSundryType)) && (detSundryCode == null))
{ {
sundryBalMap = new HashMap(); sundryBalMap = new HashMap();
...@@ -510,12 +522,16 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -510,12 +522,16 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
if (errString != null && errString.indexOf("Error") != -1 ) if (errString != null && errString.indexOf("Error") != -1 )
{ {
errString = Fcommon.checkGlTranDrCr("JOUR",tranId,conn); errString = Fcommon.checkGlTranDrCr("JOUR",tranId,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
} }
} }
if (errString != null && errString.indexOf("Error") != -1 ) if (errString != null && errString.indexOf("Error") != -1 )
{ {
System.out.println("Returning Result "+errString); System.out.println("Returning Result "+errString);
conn.rollback(); //conn.rollback();
return errString; return errString;
} }
else else
...@@ -536,7 +552,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -536,7 +552,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
int upd = pstmt.executeUpdate(); int upd = pstmt.executeUpdate();
System.out.println(" journal Confirmed:: "+upd); System.out.println(" journal Confirmed:: "+upd);
errString = itmDBAccessEJB.getErrorString("","VTCONF",""); errString = itmDBAccessEJB.getErrorString("","VTCONF","");
pstmt.close();pstmt = null; pstmt.close();
pstmt = null;
} }
if("Y".equalsIgnoreCase (journalMap.get("reversible").toString()) && "Y".equalsIgnoreCase (journalMap.get("auto_rev").toString()) && "N".equalsIgnoreCase (journalMap.get("status").toString())) if("Y".equalsIgnoreCase (journalMap.get("reversible").toString()) && "Y".equalsIgnoreCase (journalMap.get("auto_rev").toString()) && "N".equalsIgnoreCase (journalMap.get("status").toString()))
{ {
...@@ -800,12 +817,19 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -800,12 +817,19 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
if ("Y".equalsIgnoreCase(IBCAAConf)) if ("Y".equalsIgnoreCase(IBCAAConf))
{ {
errString = gbfRetrieveJournal(tranId,xtraParams,conn); errString = gbfRetrieveJournal(tranId,xtraParams,conn);
return errString; if(errString != null && errString.trim().length() > 0)
{
return errString;
}
} }
else if (siteFr.equalsIgnoreCase(siteTo)) else if (siteFr.equalsIgnoreCase(siteTo))
{ {
IBCAAConf = "Y"; IBCAAConf = "Y";
errString= gbfRetrieveJournal (tranId,xtraParams,conn); errString= gbfRetrieveJournal (tranId,xtraParams,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
IBCAAConf = "N"; IBCAAConf = "N";
System.out.println("IBCAAConf : : ::" +IBCAAConf); System.out.println("IBCAAConf : : ::" +IBCAAConf);
} }
...@@ -825,10 +849,9 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -825,10 +849,9 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
} // end of if for reversible jv } // end of if for reversible jv
conn.commit(); //conn.commit();
errString = itmDBAccessEJB.getErrorString("","CONFSUCCES",""); errString = itmDBAccessEJB.getErrorString("","CONFSUCCES","");
System.out.println("JV Confirmed .."+errString); System.out.println("JV Confirmed .."+errString);
} // end of else } // end of else
return errString; return errString;
}// end ofTry - gbfPostJournal }// end ofTry - gbfPostJournal
...@@ -852,11 +875,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -852,11 +875,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
if(rs1 != null){rs1.close();rs1 = null;} if(rs1 != null){rs1.close();rs1 = null;}
if(pstmt != null){pstmt.close();pstmt = null;} if(pstmt != null){pstmt.close();pstmt = null;}
if(pstmt1 != null){pstmt1.close();pstmt1 = null;} if(pstmt1 != null){pstmt1.close();pstmt1 = null;}
if(conn != null)
{
conn.close();
conn = null;
}
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -1102,7 +1120,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1102,7 +1120,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
errString = Fcommon.gbf_sundrybal_upd(sundryBalMap,conn); errString = Fcommon.gbf_sundrybal_upd(sundryBalMap,conn);
if(errString != null && errString.indexOf("Error") != -1 ) if(errString != null && errString.indexOf("Error") != -1 )
{ {
break; return errString;
} }
} }
...@@ -1148,7 +1166,11 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1148,7 +1166,11 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
glTraceMap.put("proj_code",detProjCode); glTraceMap.put("proj_code",detProjCode);
errString = Fcommon.glTraceUpdate(glTraceMap,conn); errString = Fcommon.glTraceUpdate(glTraceMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
if(!("O".equalsIgnoreCase (detSundryType))) if(!("O".equalsIgnoreCase (detSundryType)))
{ {
sundryBalMap = new HashMap(); sundryBalMap = new HashMap();
...@@ -1176,6 +1198,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1176,6 +1198,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
sundryBalMap.put("contact_code",Fcommon.getContactCode(detSundryType,detSundryCode,conn)); sundryBalMap.put("contact_code",Fcommon.getContactCode(detSundryType,detSundryCode,conn));
errString = Fcommon.gbf_sundrybal_upd(sundryBalMap,conn); errString = Fcommon.gbf_sundrybal_upd(sundryBalMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
} }
} }
/* accounting effect for site code - end */ /* accounting effect for site code - end */
...@@ -1184,6 +1210,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1184,6 +1210,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
if (errString != null && errString.indexOf("Error") != -1 ) if (errString != null && errString.indexOf("Error") != -1 )
{ {
errString = Fcommon.checkGlTranDrCr("JOUR",tranId,conn); errString = Fcommon.checkGlTranDrCr("JOUR",tranId,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
} }
} }
confirm = journalMap.get("confirmed").toString().trim(); confirm = journalMap.get("confirmed").toString().trim();
...@@ -1201,7 +1231,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1201,7 +1231,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
int upd = pstmt.executeUpdate(); int upd = pstmt.executeUpdate();
System.out.println("journal Confirmed:: "+upd); System.out.println("journal Confirmed:: "+upd);
errString = itmDBAccessEJB.getErrorString("","VTCONF",""); errString = itmDBAccessEJB.getErrorString("","VTCONF","");
pstmt.close();pstmt = null; pstmt.close();
pstmt = null;
//return errString;
} }
if ("P".equalsIgnoreCase (link) || "A".equalsIgnoreCase(link)) // link is link_type from ibca_pay_ctrl if ("P".equalsIgnoreCase (link) || "A".equalsIgnoreCase(link)) // link is link_type from ibca_pay_ctrl
{ {
...@@ -1467,7 +1500,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1467,7 +1500,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
glTraceMap.put("proj_code",detProjCode); glTraceMap.put("proj_code",detProjCode);
errString = Fcommon.glTraceUpdate(glTraceMap,conn); errString = Fcommon.glTraceUpdate(glTraceMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
if(!("O".equalsIgnoreCase (detSundryType))) if(!("O".equalsIgnoreCase (detSundryType)))
{ {
sundryBalMap = new HashMap(); sundryBalMap = new HashMap();
...@@ -1495,7 +1531,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1495,7 +1531,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
sundryBalMap.put("contact_code",Fcommon.getContactCode(detSundryType,detSundryCode,conn)); sundryBalMap.put("contact_code",Fcommon.getContactCode(detSundryType,detSundryCode,conn));
errString = Fcommon.gbf_sundrybal_upd(sundryBalMap,conn); errString = Fcommon.gbf_sundrybal_upd(sundryBalMap,conn);
return errString; if(errString != null && errString.trim().length() > 0)
{
return errString;
}
} }
} }
/* accounting effect for site code for - auto generation site - end */ /* accounting effect for site code for - auto generation site - end */
...@@ -1513,7 +1552,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1513,7 +1552,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
/*calling gbfPostJournal - (Normal Posting) by passing tranIDSer - (new generated tran_id)*/ /*calling gbfPostJournal - (Normal Posting) by passing tranIDSer - (new generated tran_id)*/
//changed at 12/08/11 by chandni //changed at 12/08/11 by chandni
errString = this.gbfPostJournal(tranIDSer,jMap,jdList,xtraParams,conn); errString = this.gbfPostJournal(tranIDSer,jMap,jdList,xtraParams,conn);
return errString; if(errString != null && errString.trim().length() > 0)
{
return errString;
}
}// A or P }// A or P
}// end ofTry - otherSitePostJournal }// end ofTry - otherSitePostJournal
catch(SQLException e) catch(SQLException e)
...@@ -1536,11 +1578,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1536,11 +1578,6 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
if(rs1 != null){rs1.close();rs1 = null;} if(rs1 != null){rs1.close();rs1 = null;}
if(pstmt != null){pstmt.close();pstmt = null;} if(pstmt != null){pstmt.close();pstmt = null;}
if(pstmt1 != null){pstmt1.close();pstmt1 = null;} if(pstmt1 != null){pstmt1.close();pstmt1 = null;}
if(conn != null)
{
conn.close();
conn = null;
}
} }
catch(Exception e) catch(Exception e)
{ {
......
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