errorString

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

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

@@ -46,6 +46,7 @@ public class CommissiondetPos extends ValidatorEJB implements  CommissiondetPosL
 		System.out.println("Connection = "+conn);
 		try
 		{
+			//System.out.println("@@@@@@@8");
 			conn.setAutoCommit(false);
 			GenericUtility genericUtility = GenericUtility.getInstance();
 			ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
@@ -153,8 +154,8 @@ public class CommissiondetPos extends ValidatorEJB implements  CommissiondetPosL
 									c.setTime((validUptoLast));
 									c.add(Calendar.DATE, (diffInDays - 1));
 									validUptoLast = new Timestamp( c.getTimeInMillis());
-									System.out.println("@@@@@@@@@@@@ new date into validUpto new 2: ["+validUptoLast+"]");
-									if( effDateLast.after(validUptoLast))         //added cpatil
+									System.out.println("@@@@@@@@@@@@ new date into validUpto new 2: ["+validUptoLast+"]::::effDateLast["+effDateLast+"]");
+									if( effDateLast.after(validUptoLast))         //added cpatil  // && !(effDateLast.equals(validUptoLast))
 									{
 										errString = itmDBAccessEJB.getErrorString("","INVEFDATE",userId);
 										return errString;
@@ -201,10 +202,12 @@ public class CommissiondetPos extends ValidatorEJB implements  CommissiondetPosL
 				isError = true;
 				if(conn != null)
 				{
+					//System.out.println("@@@@@@@5");
 					conn.rollback();
 				}
-				if( errString != null )
+				if( errString != null && errString.trim().length() >  0 )
 				{
+					//System.out.println("@@@@@@@6");
 					conn.rollback();
 				}
 				System.out.println("Exception.. "+e.getMessage());
@@ -220,19 +223,22 @@ public class CommissiondetPos extends ValidatorEJB implements  CommissiondetPosL
 		finally
 		{
 			try
-			{		
+			{		//System.out.println("@@@@@@@1");
 				if(isError)
 				{
+					//System.out.println("@@@@@@@2");
 					conn.rollback();
 					System.out.println("Transaction rollback... ");
 				}
-				else if( errString != null )
+				else if( errString != null && errString.trim().length() >  0 )
 				{
+					//System.out.println("@@@@@@@3");
 					conn.rollback();
 					System.out.println("Transaction rollback... ");
 				}
 				else
 				{
+					//System.out.println("@@@@@@@4");
 					conn.commit();
 					System.out.println("@@@@ Transaction commit... ");
 				}