getDataSource() now returns the same datasource instance.
Merge pull request #798 from nla/bug/acm-leak

Fix connection leak.