Skip to content

Commit b7514ce

Browse files
Fixed review comments
1 parent 3ea4323 commit b7514ce

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

web/pgadmin/browser/server_groups/servers/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
from pgadmin.utils.constants import UNAUTH_REQ, MIMETYPE_APP_JS, \
4040
SERVER_CONNECTION_CLOSED, RESTRICTION_TYPE_SQL
4141
from sqlalchemy import or_
42+
from sqlalchemy.orm import object_session
4243
from sqlalchemy.orm.attributes import flag_modified
4344
from pgadmin.utils.preferences import Preferences
4445
from .... import socketio as sio
@@ -1468,7 +1469,9 @@ def connect(self, gid, sid, is_qt=False, server=None):
14681469
shared_server = None
14691470
if server.shared and server.user_id != current_user.id:
14701471
shared_server = ServerModule.get_shared_server(server, gid)
1471-
db.session.expunge(server)
1472+
sess = object_session(server)
1473+
if sess is not None:
1474+
sess.expunge(server)
14721475
server = ServerModule.get_shared_server_properties(server,
14731476
shared_server)
14741477
if server is None:

0 commit comments

Comments
 (0)