diff --git a/src/main/java/ortus/boxlang/modules/orm/ORMRequestContext.java b/src/main/java/ortus/boxlang/modules/orm/ORMRequestContext.java index 4c0d58a..6ee1d64 100644 --- a/src/main/java/ortus/boxlang/modules/orm/ORMRequestContext.java +++ b/src/main/java/ortus/boxlang/modules/orm/ORMRequestContext.java @@ -14,9 +14,12 @@ import ortus.boxlang.runtime.context.IBoxContext; import ortus.boxlang.runtime.context.IJDBCCapableContext; import ortus.boxlang.runtime.context.RequestBoxContext; +import ortus.boxlang.runtime.dynamic.casters.BooleanCaster; import ortus.boxlang.runtime.jdbc.ConnectionManager; import ortus.boxlang.runtime.jdbc.DataSource; import ortus.boxlang.runtime.scopes.Key; +import ortus.boxlang.runtime.types.IStruct; +import ortus.boxlang.runtime.types.exceptions.BoxRuntimeException; /** * Transient context for ORM requests. @@ -53,6 +56,12 @@ public class ORMRequestContext { * @return The ORMRequestContext for the given context. */ public static ORMRequestContext getForContext( IBoxContext context ) { + IStruct appSettings = ( IStruct ) context.getConfigItem( Key.applicationSettings ); + logger.debug( "application settings: {}", appSettings ); + if ( !appSettings.containsKey( ORMKeys.ORMEnabled ) + || !BooleanCaster.cast( appSettings.getOrDefault( ORMKeys.ORMEnabled, false ) ) ) { + throw new BoxRuntimeException( "Could not acquire ORM context; ORMEnabled is false or not specified. Is this application ORM-enabled?" ); + } return context.getAttachment( ORMKeys.ORMRequestContext ); } diff --git a/src/main/java/ortus/boxlang/modules/orm/interceptors/BaseListener.java b/src/main/java/ortus/boxlang/modules/orm/interceptors/BaseListener.java index 2e8d7ad..ebdb141 100644 --- a/src/main/java/ortus/boxlang/modules/orm/interceptors/BaseListener.java +++ b/src/main/java/ortus/boxlang/modules/orm/interceptors/BaseListener.java @@ -25,7 +25,7 @@ public class BaseListener extends BaseInterceptor { protected static ORMConfig getORMConfig( RequestBoxContext context ) { IStruct appSettings = ( IStruct ) context.getConfigItem( Key.applicationSettings ); if ( !appSettings.containsKey( ORMKeys.ORMEnabled ) - || BooleanCaster.cast( appSettings.getOrDefault( ORMKeys.ORMEnabled, false ) ) ) { + || !BooleanCaster.cast( appSettings.getOrDefault( ORMKeys.ORMEnabled, false ) ) ) { logger.info( "ORMEnabled is false or not specified;" ); return null; }