Skip to content

[Backport 1.28.x] Do not close JNDI-resolved DataSource in JDBCQuotaStore.close()#1524

Merged
groldan merged 1 commit into
1.28.xfrom
backport-1523-to-1.28.x
May 11, 2026
Merged

[Backport 1.28.x] Do not close JNDI-resolved DataSource in JDBCQuotaStore.close()#1524
groldan merged 1 commit into
1.28.xfrom
backport-1523-to-1.28.x

Conversation

@geoserver-bot
Copy link
Copy Markdown
Collaborator

Backport #1523
Authored by: @groldan

@groldan
Copy link
Copy Markdown
Member

groldan commented May 11, 2026

QA build failure is unrelated, working on a fix though

@groldan
Copy link
Copy Markdown
Member

groldan commented May 11, 2026

JNDI lookups return a DataSource owned by the JNDI provider; consumers must
not close it, since the same name can be (and typically is) shared with other
parts of the application.

Add an ownsDataSource flag (default true to keep the previous behavior for
direct setDataSource callers) that JDBCQuotaStoreFactory clears whenever the
configuration uses a JNDISource.

on-behalf-of: @camptocamp <info@camptocamp.com>
@groldan groldan force-pushed the backport-1523-to-1.28.x branch from 51cea19 to 2d46b41 Compare May 11, 2026 14:45
@groldan
Copy link
Copy Markdown
Member

groldan commented May 11, 2026

QA fix applied, rebased

@groldan groldan merged commit e57fc9e into 1.28.x May 11, 2026
5 checks passed
@groldan groldan deleted the backport-1523-to-1.28.x branch May 11, 2026 15:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants