Skip to content

Commit 8da93ac

Browse files
committed
Adjust naming of Settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled.
1 parent d0a2eb3 commit 8da93ac

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

src/NHibernate.Test/NHSpecificTest/NH1082/Fixture.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public override string BugNumber
1515
[Test]
1616
public void ExceptionsInBeforeTransactionCompletionAbortTransaction()
1717
{
18-
Assert.IsFalse(sessions.Settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptions);
18+
Assert.IsFalse(sessions.Settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled);
1919

2020
var c = new C {ID = 1, Value = "value"};
2121

@@ -39,7 +39,7 @@ public void ExceptionsInBeforeTransactionCompletionAbortTransaction()
3939
[Test]
4040
public void ExceptionsInSynchronizationBeforeTransactionCompletionAbortTransaction()
4141
{
42-
Assert.IsFalse(sessions.Settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptions);
42+
Assert.IsFalse(sessions.Settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled);
4343

4444
var c = new C { ID = 1, Value = "value" };
4545

@@ -80,7 +80,7 @@ protected override void Configure(Configuration configuration)
8080
[Test]
8181
public void ExceptionsInBeforeTransactionCompletionAreIgnored()
8282
{
83-
Assert.IsTrue(sessions.Settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptions);
83+
Assert.IsTrue(sessions.Settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled);
8484

8585
var c = new C {ID = 1, Value = "value"};
8686

@@ -108,7 +108,7 @@ public void ExceptionsInBeforeTransactionCompletionAreIgnored()
108108
[Test]
109109
public void ExceptionsInSynchronizationBeforeTransactionCompletionAreIgnored()
110110
{
111-
Assert.IsTrue(sessions.Settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptions);
111+
Assert.IsTrue(sessions.Settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled);
112112

113113
var c = new C { ID = 1, Value = "value" };
114114

src/NHibernate/Cfg/Settings.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public Settings()
125125
/// </summary>
126126
public ILinqToHqlGeneratorsRegistry LinqToHqlGeneratorsRegistry { get; internal set; }
127127

128-
public bool IsInterceptorsBeforeTransactionCompletionIgnoreExceptions { get; internal set; }
128+
public bool IsInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled { get; internal set; }
129129

130130
#endregion
131131
}

src/NHibernate/Cfg/SettingsFactory.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,9 @@ public Settings BuildSettings(IDictionary<string, string> properties)
265265
log.Info("Named query checking : " + EnabledDisabled(namedQueryChecking));
266266
settings.IsNamedQueryStartupCheckingEnabled = namedQueryChecking;
267267

268-
var interceptorsBeforeTransactionCompletionIgnoreExceptions = PropertiesHelper.GetBoolean(Environment.InterceptorsBeforeTransactionCompletionIgnoreExceptions, properties, false);
269-
log.Info("Ignoring exceptions in BeforeTransactionCompletion : " + EnabledDisabled(interceptorsBeforeTransactionCompletionIgnoreExceptions));
270-
settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptions = interceptorsBeforeTransactionCompletionIgnoreExceptions;
268+
var interceptorsBeforeTransactionCompletionIgnoreExceptions = PropertiesHelper.GetBoolean(Environment.InterceptorsBeforeTransactionCompletionIgnoreExceptions, properties, false);
269+
log.Info("Ignoring exceptions in BeforeTransactionCompletion : " + EnabledDisabled(interceptorsBeforeTransactionCompletionIgnoreExceptions));
270+
settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled = interceptorsBeforeTransactionCompletionIgnoreExceptions;
271271

272272
// Not ported - settings.StatementFetchSize = statementFetchSize;
273273
// Not ported - ScrollableResultSetsEnabled

src/NHibernate/Impl/SessionFactoryImpl.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ public ISession OpenSession(IDbConnection connection, bool flushBeforeCompletion
493493
return
494494
new SessionImpl(connection, this, true, settings.CacheProvider.NextTimestamp(), interceptor,
495495
settings.DefaultEntityMode, flushBeforeCompletionEnabled, autoCloseSessionEnabled,
496-
settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptions, connectionReleaseMode);
496+
settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled, connectionReleaseMode);
497497
}
498498

499499
public IEntityPersister GetEntityPersister(string entityName)
@@ -1206,7 +1206,7 @@ private SessionImpl OpenSession(IDbConnection connection, bool autoClose, long t
12061206
{
12071207
SessionImpl session = new SessionImpl(connection, this, autoClose, timestamp, sessionLocalInterceptor ?? interceptor,
12081208
settings.DefaultEntityMode, settings.IsFlushBeforeCompletionEnabled,
1209-
settings.IsAutoCloseSessionEnabled, settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptions,
1209+
settings.IsAutoCloseSessionEnabled, settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled,
12101210
settings.ConnectionReleaseMode);
12111211
if (sessionLocalInterceptor != null)
12121212
{

src/NHibernate/Transaction/AdoTransaction.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ private void NotifyLocalSynchsBeforeTransactionCompletion()
425425
catch (Exception e)
426426
{
427427
log.Error("exception calling user Synchronization", e);
428-
if (!session.Factory.Settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptions)
428+
if (!session.Factory.Settings.IsInterceptorsBeforeTransactionCompletionIgnoreExceptionsEnabled)
429429
throw;
430430
}
431431
}

0 commit comments

Comments
 (0)