opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #215 from dannon/release_15.03

Browse Source 
[15.03] Check to see if toolshed install is actually bound prior to disposing (e...
This commit is contained in:
John Chilton
2015-05-05 09:26:45 -05:00
parent d523d5380e c1c8259e83
commit 5cf0332430
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/buildapp.py
+3 -1
View File
@@ -110,7 +110,9 @@ def app_factory( global_conf, **kwargs ):
except:
log.exception("Unable to dispose of pooled galaxy model database connections.")
try:
galaxy.model.tool_shed_install.mapping.metadata.bind.dispose()
# This model may not actually be bound.
if galaxy.model.tool_shed_install.mapping.metadata.bind:
galaxy.model.tool_shed_install.mapping.metadata.bind.dispose()
except:
log.exception("Unable to dispose of pooled toolshed install model database connections.")