Call into _sessions directly and remove extra IsActive check

halter73 · halter73 · commit e93008411527 · 2025-08-14T17:38:38.000-07:00
diff --git a/src/ModelContextProtocol.AspNetCore/StatefulSessionManager.cs b/src/ModelContextProtocol.AspNetCore/StatefulSessionManager.cs
@@ -49,13 +49,10 @@ public async ValueTask StartNewSessionAsync(StreamableHttpSession newSession, Ca
                 while (_nextIndexToPrune < _idleSessionIds.Count)
                 {
                     var pruneId = _idleSessionIds[_nextIndexToPrune++];
-                    if (TryGetValue(pruneId, out sessionToPrune))
+                    if (_sessions.TryRemove(pruneId, out sessionToPrune))
                     {
-                        if (!sessionToPrune.IsActive && _sessions.TryRemove(pruneId, out sessionToPrune))
-                        {
-                            LogIdleSessionLimit(pruneId, _maxIdleSessionCount);
-                            break;
-                        }
+                        LogIdleSessionLimit(pruneId, _maxIdleSessionCount);
+                        break;
                     }
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -49,13 +49,10 @@ public async ValueTask StartNewSessionAsync(StreamableHttpSession newSession, Ca`
`49`	`49`	`while (_nextIndexToPrune < _idleSessionIds.Count)`
`50`	`50`	`{`
`51`	`51`	`var pruneId = _idleSessionIds[_nextIndexToPrune++];`
`52`		`- if (TryGetValue(pruneId, out sessionToPrune))`
	`52`	`+ if (_sessions.TryRemove(pruneId, out sessionToPrune))`
`53`	`53`	`{`
`54`		`- if (!sessionToPrune.IsActive && _sessions.TryRemove(pruneId, out sessionToPrune))`
`55`		`- {`
`56`		`- LogIdleSessionLimit(pruneId, _maxIdleSessionCount);`
`57`		`- break;`
`58`		`- }`
	`54`	`+ LogIdleSessionLimit(pruneId, _maxIdleSessionCount);`
	`55`	`+ break;`
`59`	`56`	`}`
`60`	`57`	`}`
`61`	`58`