removing exception adding rollback condition

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

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

@@ -253,8 +253,11 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca
 						itemCode = genericUtility.getColumnValue("item_code",dom);
 						if( itemSer == null || itemSer.trim().length() == 0)
 						{
-						//	errString = itmDBAccessEJB.getErrorString("","VMITMSERN",userId);
-						//	break ;
+							if( ( itemSer == null || itemSer.trim().length() == 0 ) && ( itemCode == null || itemCode.trim().length() == 0))
+							{
+								errString = itmDBAccessEJB.getErrorString("","VMICOSERNU",userId);
+								break ;
+							}
 						}
 						else
 						{
@@ -263,11 +266,7 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca
 								errString = itmDBAccessEJB.getErrorString("","VMICOSERIN",userId);
 								break ;
 							}
-							else if( ( itemSer == null || itemSer.trim().length() == 0 ) && ( itemCode == null || itemCode.trim().length() == 0))
-							{
-								errString = itmDBAccessEJB.getErrorString("","VMICOSERNU",userId);
-								break ;
-							}
+							
 							sql = "SELECT COUNT(1) FROM ITEMSER WHERE ITEM_SER = ? ";
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString( 1, itemSer );
@@ -296,8 +295,11 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca
 
 						if( itemCode == null || itemCode.trim().length() == 0)
 						{
-						//	errString = itmDBAccessEJB.getErrorString("","VMITMCODNU",userId);
-						//	break ;
+							if( ( itemSer == null || itemSer.trim().length() == 0 ) && ( itemCode == null || itemCode.trim().length() == 0))
+							{
+								errString = itmDBAccessEJB.getErrorString("","VMICOSERNU",userId);
+								break ;
+							}
 						}
 						else
 						{
@@ -306,7 +308,7 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca
 									errString = itmDBAccessEJB.getErrorString("","VMICOSERIN",userId);
 									break ;
 								}
-
+								
 								sql = "SELECT COUNT(1) FROM ITEM WHERE ITEM_CODE = ?  ";
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString( 1, itemCode );
@@ -775,6 +777,7 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca
 
 				if( (effDateTemp2 != null ) && (validUptoTemp2 != null )) 
 				{
+					//if( (effDateTemp2.equals( peffDate )) )
 					if( (effDateTemp2.equals( peffDate ))  && ( validUptoTemp2.equals(pvalidUpto)) )
 					{
 						System.out.println("@@@@@@@ error in date");

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

@@ -203,6 +203,10 @@ public class CommissiondetPos extends ValidatorEJB implements  CommissiondetPosL
 				{
 					conn.rollback();
 				}
+				if( errString != null )
+				{
+					conn.rollback();
+				}
 				System.out.println("Exception.. "+e.getMessage());
 				e.printStackTrace();			
 				throw new ITMException(e);
@@ -222,6 +226,11 @@ public class CommissiondetPos extends ValidatorEJB implements  CommissiondetPosL
 					conn.rollback();
 					System.out.println("Transaction rollback... ");
 				}
+				else if( errString != null )
+				{
+					conn.rollback();
+					System.out.println("Transaction rollback... ");
+				}
 				else
 				{
 					conn.commit();