Avoid exception on promotion to session

alex-kulakov · alex-kulakov · commit 55e1461c1fec · 2023-09-07T12:31:00.000+05:00
diff --git a/Orm/Xtensive.Orm/Orm/Transaction.cs b/Orm/Xtensive.Orm/Orm/Transaction.cs
@@ -247,11 +247,10 @@ private void PromoteLifetimeTokens()
 
     private void PromoteLifetimeTokensToSession()
     {
-      if (Outer != null
-          || !Session.TryPromoteTokens(EnumerableUtils.One(LifetimeToken).Union(lifetimeTokens))) {
-        throw new InvalidOperationException("Promoting to session is not supported.");
+      if (Outer == null
+          && Session.TryPromoteTokens(EnumerableUtils.One(LifetimeToken).Union(lifetimeTokens))) {
+        ClearLifetimeTokens();
       }
-      ClearLifetimeTokens();
     }
 
     private void ClearLifetimeTokens()

Original file line number	Diff line number	Diff line change
`@@ -247,11 +247,10 @@ private void PromoteLifetimeTokens()`
`247`	`247`
`248`	`248`	`private void PromoteLifetimeTokensToSession()`
`249`	`249`	`{`
`250`		`- if (Outer != null`
`251`		`- \|\| !Session.TryPromoteTokens(EnumerableUtils.One(LifetimeToken).Union(lifetimeTokens))) {`
`252`		`- throw new InvalidOperationException("Promoting to session is not supported.");`
	`250`	`+ if (Outer == null`
	`251`	`+ && Session.TryPromoteTokens(EnumerableUtils.One(LifetimeToken).Union(lifetimeTokens))) {`
	`252`	`+ ClearLifetimeTokens();`
`253`	`253`	`}`
`254`		`- ClearLifetimeTokens();`
`255`	`254`	`}`
`256`	`255`
`257`	`256`	`private void ClearLifetimeTokens()`