[Springnet-commits] Spring.Net/src/Spring/Spring.Data/Data/Support ErrorCodeExceptionTranslator.cs, 1.10, 1.11

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Data/Data/Support
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5925/Support

Modified Files:
	ErrorCodeExceptionTranslator.cs 
Log Message:
SPRNET-457 - ErrorCode translation can produce extraneous UncategorizedDataAccessException

Index: ErrorCodeExceptionTranslator.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Data/Data/Support/ErrorCodeExceptionTranslator.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ErrorCodeExceptionTranslator.cs	30 Oct 2007 15:24:44 -0000	1.10
--- ErrorCodeExceptionTranslator.cs	6 Dec 2007 20:14:30 -0000	1.11
***************
*** 180,219 ****
  	            if (errorCode != null)
  	            {
! 	                if (Array.BinarySearch(errorCodes.BadSqlGrammarCodes, errorCode) >=0)
  	                {
  	                    LogTranslation(task, sql, errorCode, exception, false);
  	                    return new BadSqlGrammarException(task, sql, exception);
  	                }
!                     else if (Array.BinarySearch(errorCodes.InvalidResultSetAccessCodes, errorCode) >= 0) 
                      {
                          LogTranslation(task, sql, errorCode, exception, false);
                          return new InvalidResultSetAccessException(task, sql, exception);
!                     }            
!                     else if (Array.BinarySearch(errorCodes.DataAccessResourceFailureCodes, errorCode) >= 0) 
                      {
                          LogTranslation(task, sql, errorCode, exception, false);
                          return new DataAccessResourceFailureException(BuildMessage(task, sql, exception), exception);
                      }
!                     else if (Array.BinarySearch(errorCodes.PermissionDeniedCodes, errorCode) >= 0) 
                      {
                          LogTranslation(task, sql, errorCode, exception, false);
                          return new PermissionDeniedDataAccessException(BuildMessage(task, sql, exception), exception);
                      }
!                     else if (Array.BinarySearch(errorCodes.DataIntegrityViolationCodes, errorCode) >= 0) 
                      {
                          LogTranslation(task, sql, errorCode, exception, false);
                          return new DataIntegrityViolationException(BuildMessage(task, sql, exception), exception);
                      }
!                     else if (Array.BinarySearch(errorCodes.CannotAcquireLockCodes, errorCode) >= 0) 
                      {
                          LogTranslation(task, sql, errorCode, exception, false);
                          return new CannotAcquireLockException(BuildMessage(task, sql, exception), exception);
                      }
!                     else if (Array.BinarySearch(errorCodes.DeadlockLoserCodes, errorCode) >= 0) 
                      {
                          LogTranslation(task, sql, errorCode, exception, false);
                          return new DeadlockLoserDataAccessException(BuildMessage(task, sql, exception), exception);
                      }
!                     else if (Array.BinarySearch(errorCodes.CannotSerializeTransactionCodes, errorCode) >= 0) 
                      {
                          LogTranslation(task, sql, errorCode, exception, false);
--- 180,219 ----
  	            if (errorCode != null)
  	            {
!                     if (Array.IndexOf(errorCodes.BadSqlGrammarCodes, errorCode) >= 0)
  	                {
  	                    LogTranslation(task, sql, errorCode, exception, false);
  	                    return new BadSqlGrammarException(task, sql, exception);
  	                }
!                     else if (Array.IndexOf(errorCodes.InvalidResultSetAccessCodes, errorCode) >= 0) 
                      {
                          LogTranslation(task, sql, errorCode, exception, false);
                          return new InvalidResultSetAccessException(task, sql, exception);
!                     }
!                     else if (Array.IndexOf(errorCodes.DataAccessResourceFailureCodes, errorCode) >= 0) 
                      {
                          LogTranslation(task, sql, errorCode, exception, false);
                          return new DataAccessResourceFailureException(BuildMessage(task, sql, exception), exception);
                      }
!                     else if (Array.IndexOf(errorCodes.PermissionDeniedCodes, errorCode) >= 0) 
                      {
                          LogTranslation(task, sql, errorCode, exception, false);
                          return new PermissionDeniedDataAccessException(BuildMessage(task, sql, exception), exception);
                      }
!                     else if (Array.IndexOf(errorCodes.DataIntegrityViolationCodes, errorCode) >= 0) 
                      {
                          LogTranslation(task, sql, errorCode, exception, false);
                          return new DataIntegrityViolationException(BuildMessage(task, sql, exception), exception);
                      }
!                     else if (Array.IndexOf(errorCodes.CannotAcquireLockCodes, errorCode) >= 0) 
                      {
                          LogTranslation(task, sql, errorCode, exception, false);
                          return new CannotAcquireLockException(BuildMessage(task, sql, exception), exception);
                      }
!                     else if (Array.IndexOf(errorCodes.DeadlockLoserCodes, errorCode) >= 0) 
                      {
                          LogTranslation(task, sql, errorCode, exception, false);
                          return new DeadlockLoserDataAccessException(BuildMessage(task, sql, exception), exception);
                      }
!                     else if (Array.IndexOf(errorCodes.CannotSerializeTransactionCodes, errorCode) >= 0) 
                      {
                          LogTranslation(task, sql, errorCode, exception, false);