From 09291a8216bf6f213f6c82bc3e636537a165f73f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20=C3=96hrn?= Date: Thu, 27 Feb 2014 08:57:38 +0100 Subject: [PATCH] SPRNET-1567 Assigning correct timeout SPRNET-1567 HibernateTransactionManager assign incorrect connection timeout Now assigning the correct timeout to the correct property --- .../Data/NHibernate/HibernateTransactionManager.cs | 2 +- .../Data/NHibernate/HibernateTxScopeTransactionManager.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTransactionManager.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTransactionManager.cs index dadaa52c..cac328e0 100644 --- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTransactionManager.cs +++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTransactionManager.cs @@ -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) { diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTxScopeTransactionManager.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTxScopeTransactionManager.cs index ae91f71c..9342eee6 100644 --- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTxScopeTransactionManager.cs +++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTxScopeTransactionManager.cs @@ -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) {