updated

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

webitm-dis/ibase/webitm/ejb/dis/RpermitGenPrc.java

@@ -26,7 +26,7 @@ public class RpermitGenPrc extends ProcessEJB implements RpermitGenPrcLocal,Rper
 {
 	static
 	{
-		System.out.println("-- RpermitGenPrc compiled -- ");
+		System.out.println("-- RpermitGenPrc loaded -- ");
 	}
 	public String process() throws RemoteException,ITMException
 	{
@@ -243,24 +243,6 @@ public class RpermitGenPrc extends ProcessEJB implements RpermitGenPrcLocal,Rper
 				System.out.println(" method calling ....");
 				errString = generateRPermit(hmap,xtraParams,conn);
 			}
-			if((errString != null ) &&  (errString.indexOf("Success") > -1))
-			{
-				conn.commit();
-				System.out.println("--process completed--");
-				errString = itmDBAccessEJB.getErrorString("","VPSUCC1    ","","",conn);
-			}
-			else if((errString != null ) &&  (errString.indexOf("VPRANGNT1") > -1))
-			{
-				conn.rollback();
-				System.out.println("--error in generate permit no.--");
-				errString = itmDBAccessEJB.getErrorString("","VPRANGNT1    ","","",conn);
-			}
-			else 
-			{
-				conn.rollback();
-				System.out.println("--process not completed--");
-				errString = itmDBAccessEJB.getErrorString("","VTEPFAIL  ","","",conn);
-			}
 		}
 		catch( Exception e)
 		{			
@@ -280,15 +262,23 @@ public class RpermitGenPrc extends ProcessEJB implements RpermitGenPrcLocal,Rper
 				{
 					if(errString != null && errString.trim().length() > 0)
 					{
-						if(errString.indexOf("VPSUCC1") > -1 )
+						if((errString != null ) &&  (errString.indexOf("Success") > -1))
 						{
 							conn.commit();
-							System.out.println("--transaction commited--");
+							System.out.println("--process completed--");
+							errString = itmDBAccessEJB.getErrorString("","VPSUCC1    ","","",conn);
+						}
+						else if((errString != null ) &&  (errString.indexOf("VPRANGNT1") > -1))
+						{
+							conn.rollback();
+							System.out.println("--error in generate permit no.--");
+							errString = itmDBAccessEJB.getErrorString("","VPRANGNT1    ","","",conn);
 						}
 						else 
 						{
 							conn.rollback();
-							System.out.println("--transaction rollback--");
+							System.out.println("--process not completed--");
+							errString = itmDBAccessEJB.getErrorString("","VTEPFAIL  ","","",conn);
 						}
 					}
 					if(pstmt != null)

webitm-dis/ibase/webitm/ejb/dis/RpermitUpdPrc.java

@@ -230,24 +230,6 @@ public class RpermitUpdPrc extends ProcessEJB implements RpermitUpdPrcLocal,Rper
 				System.out.println(" method calling ....");
 				errString = UpdateRPermit(hmap,xtraParams,conn);
 			}
-			if((errString != null ) &&  (errString.indexOf("Success") > -1))
-			{
-				conn.commit();
-				System.out.println("--process completed--");
-				errString = itmDBAccessEJB.getErrorString("","VPSUCC1    ","","",conn);
-			}
-			else if((errString != null ) &&  (errString.indexOf("VTNOREC") > -1))
-			{
-				conn.rollback();
-				System.out.println("--no record found--");
-				errString = itmDBAccessEJB.getErrorString("","VTNOREC1    ","","",conn);
-			}
-			else 
-			{
-				conn.rollback();
-				System.out.println("--process not completed--");
-				errString = itmDBAccessEJB.getErrorString("","VTEPFAIL  ","","",conn);
-			}
 		}
 		catch( Exception e)
 		{			
@@ -267,15 +249,23 @@ public class RpermitUpdPrc extends ProcessEJB implements RpermitUpdPrcLocal,Rper
 				{
 					if(errString != null && errString.trim().length() > 0)
 					{
-						if(errString.indexOf("VPSUCC1") > -1 )
+						if((errString != null ) &&  (errString.indexOf("Success") > -1))
 						{
 							conn.commit();
-							System.out.println("--transaction commited--");
+							System.out.println("--process completed--");
+							errString = itmDBAccessEJB.getErrorString("","VPSUCC1    ","","",conn);
+						}
+						else if((errString != null ) &&  (errString.indexOf("VTNOREC") > -1))
+						{
+							conn.rollback();
+							System.out.println("--no record found--");
+							errString = itmDBAccessEJB.getErrorString("","VTNOREC1    ","","",conn);
 						}
 						else 
 						{
 							conn.rollback();
-							System.out.println("--transaction rollback--");
+							System.out.println("--process not completed--");
+							errString = itmDBAccessEJB.getErrorString("","VTEPFAIL  ","","",conn);
 						}
 					}
 					if( conn != null && ! conn.isClosed() )
@@ -283,6 +273,16 @@ public class RpermitUpdPrc extends ProcessEJB implements RpermitUpdPrcLocal,Rper
 						conn.close();
 						conn = null;
 					}
+					if(pstmt != null)
+					{
+						pstmt.close();
+						pstmt = null;					
+					}
+					if(rs != null)
+					{
+						rs.close();
+						rs = null;
+					}
 				}
 				catch(Exception e)
 				{