Merge pull request #67 from yhrn/SPRNET-1567

SPRNET-1567 Assigning correct timeout
This commit is contained in:
Steve Bohlen
2014-03-01 17:28:02 -05:00
2 changed files with 2 additions and 2 deletions

View File

@@ -436,7 +436,7 @@ namespace Spring.Data.NHibernate
ConnectionHolder conHolder = new ConnectionHolder(con, adoTx);
if (timeout != DefaultTransactionDefinition.TIMEOUT_DEFAULT)
{
conHolder.TimeoutInMillis = definition.TransactionTimeout;
conHolder.TimeoutInSeconds = timeout;
}
if (log.IsDebugEnabled)
{

View File

@@ -454,7 +454,7 @@ namespace Spring.Data.NHibernate
ConnectionHolder conHolder = new ConnectionHolder(con, adoTx);
if (timeout != DefaultTransactionDefinition.TIMEOUT_DEFAULT)
{
conHolder.TimeoutInMillis = definition.TransactionTimeout;
conHolder.TimeoutInSeconds = timeout;
}
if (log.IsDebugEnabled)
{