Skip to content

Commit 6ad0459

Browse files
committed
more fixes
1 parent 508c694 commit 6ad0459

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

system/core/dynamic/ObjectPopulator.cfc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,8 @@ component accessors="true" singleton {
569569
var annotations = server.keyExists( "boxlang" ) ? getClassMetadata(
570570
arguments.relationalMeta.properties[ key ].cfc
571571
).annotations : getComponentMetadata( arguments.relationalMeta.properties[ key ].cfc );
572+
573+
// Verify if the entityName annotation exists
572574
if ( annotations.keyExists( "entityName" ) ) {
573575
targetEntityName = annotations.entityName;
574576
}

system/core/events/EventPoolManager.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ component accessors="true" {
230230
if (
231231
arguments.metadata.keyExists( "extends" )
232232
AND
233-
!isNull( arguments.metadata.extends )
233+
!arguments.metadata.extends.isEmpty()
234234
AND
235235
!listFindNoCase( getStopRecursionClasses(), arguments.metadata.extends.name )
236236
) {

system/exceptions/js/coldfusion-brush.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
'EncryptBinary Evaluate Exp ExpandPath FileClose FileCopy FileDelete FileExists FileIsEOF FileMove FileOpen FileRead ' +
3535
'FileReadBinary FileReadLine FileSetAccessMode FileSetAttribute FileSetLastModified FileWrite Find FindNoCase FindOneOf ' +
3636
'FirstDayOfMonth Fix FormatBaseN GenerateSecretKey GetAuthUser GetBaseTagData GetBaseTagList GetBaseTemplatePath ' +
37-
'GetClientVariablesList GetComponentMetaData GetContextRoot GetCurrentTemplatePath GetDirectoryFromPath GetEncoding ' +
37+
'GetClientVariablesList GetComponentMetaData GetClassMetadata GetContextRoot GetCurrentTemplatePath GetDirectoryFromPath GetEncoding ' +
3838
'GetException GetFileFromPath GetFileInfo GetFunctionList GetGatewayHelper GetHttpRequestData GetHttpTimeString ' +
3939
'GetK2ServerDocCount GetK2ServerDocCountLimit GetLocale GetLocaleDisplayName GetLocalHostIP GetMetaData GetMetricData ' +
4040
'GetPageContext GetPrinterInfo GetProfileSections GetProfileString GetReadableImageFormats GetSOAPRequest GetSOAPRequestHeader ' +

0 commit comments

Comments
 (0)