This is an automated email from the ASF dual-hosted git repository. borinquenkid pushed a commit to branch test/document-datamapping-events in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 1ca4940ed4438b27faa77a9cafcbe84494361eaf Author: Walter Duque de Estrada <[email protected]> AuthorDate: Fri Aug 14 11:15:37 2026 -0500 Fix MultiTenantEventListener IntelliJ warnings Renamed the local RxDatastoreClient variable in onApplicationEvent from datastoreClient to sourceClient, since it shadowed the class's own datastoreClient field (the source of the "might not be assigned" confusion) and made the two equals() calls read ambiguously. Both this.datastoreClient.equals(datastoreClient) calls are now datastoreClient == sourceClient, Groovy's idiomatic null-safe equals. No behavior change; full suite, jacoco, and codeStyle clean. --- .../grails/gorm/rx/events/MultiTenantEventListener.groovy | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/events/MultiTenantEventListener.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/events/MultiTenantEventListener.groovy index a7905c1cc8..e01ef112b7 100644 --- a/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/events/MultiTenantEventListener.groovy +++ b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/events/MultiTenantEventListener.groovy @@ -62,18 +62,18 @@ class MultiTenantEventListener implements PersistenceEventListener { @Override void onApplicationEvent(ApplicationEvent event) { if (supportsEventType(event.getClass())) { - RxDatastoreClient datastoreClient = (RxDatastoreClient) event.getSource() - Assert.notNull(datastoreClient, 'Datastore client should never be null from source event') + RxDatastoreClient sourceClient = (RxDatastoreClient) event.getSource() + Assert.notNull(sourceClient, 'Datastore client should never be null from source event') if (event instanceof PreQueryEvent) { PreQueryEvent preQueryEvent = (PreQueryEvent) event Query query = preQueryEvent.getQuery() PersistentEntity entity = query.getEntity() if (entity.isMultiTenant()) { - if (supportsSourceType(datastoreClient.getClass()) && this.datastoreClient.equals(datastoreClient)) { + if (supportsSourceType(sourceClient.getClass()) && datastoreClient == sourceClient) { TenantId tenantId = entity.getTenantId() if (tenantId != null) { - Serializable currentId = Tenants.currentId(datastoreClient.getClass()) + Serializable currentId = Tenants.currentId(sourceClient.getClass()) query.eq(tenantId.getName(), currentId) } } @@ -85,8 +85,8 @@ class MultiTenantEventListener implements PersistenceEventListener { if (entity.isMultiTenant()) { TenantId tenantId = entity.getTenantId() EntityReflector reflector = entity.getReflector() - if (supportsSourceType(datastoreClient.getClass()) && this.datastoreClient.equals(datastoreClient)) { - Serializable currentId = Tenants.currentId(datastoreClient.getClass()) + if (supportsSourceType(sourceClient.getClass()) && datastoreClient == sourceClient) { + Serializable currentId = Tenants.currentId(sourceClient.getClass()) if (currentId != null) { try { if (currentId == ConnectionSource.DEFAULT) {
