Skip to content

fix: make MCPManager singleton thread-safe with double-checked locking #813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
voidborne-d wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −1
Open

fix: make MCPManager singleton thread-safe with double-checked locking #813

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion qwen_agent/tools/mcp_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,14 @@

class MCPManager:
_instance = None # Private class variable to store the unique instance
_lock = threading.Lock() # Lock for thread-safe singleton creation

def __new__(cls, *args, **kwargs):
if cls._instance is None:
cls._instance = super(MCPManager, cls).__new__(cls, *args, **kwargs)
with cls._lock:
# Double-checked locking: re-check after acquiring the lock
if cls._instance is None:
cls._instance = super(MCPManager, cls).__new__(cls, *args, **kwargs)
return cls._instance

def __init__(self):
Expand Down