Skip to content

Commit e4373f8

Browse files
committed
- BOX-163 : Dead code, possible bug, in entityGivenName method of ORMUtilSupport.cfc not returning Hibernate result and producing a null error.
1 parent 9ffc091 commit e4373f8

File tree

4 files changed

+27
-15
lines changed

4 files changed

+27
-15
lines changed

ModuleConfig.cfc

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,15 @@ component {
4141
*/
4242
function configure(){
4343
// cborm Settings
44-
settings = structCopy( variables.SETTING_DEFAULTS );
44+
variables.settings = structCopy( variables.SETTING_DEFAULTS );
4545

4646
// Register Custom DSL, don't map it because it is too late, mapping DSLs are only good by the parent app
47-
controller.getWireBox().registerDSL( namespace = "entityService", path = "#moduleMapping#.dsl.OrmDsl" );
47+
variables.controller
48+
.getWireBox()
49+
.registerDSL( namespace = "entityService", path = "#moduleMapping#.dsl.OrmDsl" );
4850

4951
// Custom Declared Points
50-
interceptorSettings = {
52+
variables.interceptorSettings = {
5153
customInterceptionPoints : [
5254
// CriteriaBuilder Events
5355
"onCriteriaBuilderAddition",
@@ -77,19 +79,19 @@ component {
7779
};
7880

7981
// Custom Declared Interceptors
80-
interceptors = [];
82+
variables.interceptors = [];
8183
}
8284

8385
/**
8486
* Fired when the module is registered and activated.
8587
*/
8688
function onLoad(){
8789
// Prepare setting defaults
88-
settings.resources.append( variables.SETTING_DEFAULTS.resources, false );
89-
settings.injection.append( variables.SETTING_DEFAULTS.injection, false );
90+
variables.settings.resources.append( variables.SETTING_DEFAULTS.resources, false );
91+
variables.settings.injection.append( variables.SETTING_DEFAULTS.injection, false );
9092
// Are we loading the event loader
91-
if ( settings.resources.eventLoader ) {
92-
wirebox.getInstance( "ResourceEventLoader@cborm" ).loadEvents();
93+
if ( variables.settings.resources.eventLoader ) {
94+
variables.wirebox.getInstance( "ResourceEventLoader@cborm" ).loadEvents();
9395
}
9496
}
9597

box.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,5 @@
6161
"logs:boxlang":"server log serverConfigFile=server-boxlang-cfml@1.json --follow",
6262
"logs:lucee":"server log serverConfigFile=server-lucee@5.json --follow",
6363
"logs:adobe":"server log serverConfigFile=server-adobe@2025.json --follow"
64-
},
65-
"installPaths":{
66-
"cbvalidation":"modules/cbvalidation/",
67-
"mementifier":"modules/mementifier/",
68-
"cbstreams":"modules/cbstreams/",
69-
"cbpaginator":"modules/cbpaginator/"
7064
}
7165
}

changelog.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
### Added
11+
12+
- Add workflow_dispatch trigger to cron.yml for manual workflow execution
13+
- Duplicate ORM settings for BoxLang-only runtime compatibility
14+
- full var scoping to avoid warnings on IDE
15+
16+
### Fixed
17+
18+
- BOX-163 : Dead code, possible bug, in `entityGivenName` method of `ORMUtilSupport.cfc` not returning Hibernate result and producing a `null` error.
19+
- BoxLang Prime support improvements with defensive coding
20+
- Conditional event handler for Adobe ColdFusion
21+
- Move CFIDE EventHandler interface reference to ACFEventHandler for better ACF isolation
22+
- Drop ACF-only interface annotation for BoxLang Prime support
23+
- More defensive coding for server.coldfusion blocks
24+
- Use @be tag for bx-compat-cfml in BoxLang server tests
25+
1026
## [4.11.0] - 2025-09-11
1127

1228
### Added

models/util/support/ORMUtilSupport.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ component singleton {
207207

208208
// Hibernate Discovery
209209
try {
210-
var entityName = getSession( getEntityDatasource( arguments.entity ) ).getEntityName(
210+
return getSession( getEntityDatasource( arguments.entity ) ).getEntityName(
211211
arguments.entity
212212
);
213213
} catch ( org.hibernate.TransientObjectException e ) {

0 commit comments

Comments
 (0)