Skip to content

Commit e279187

Browse files
committed
more ACF issues. Just removing try and letting error bubble up
1 parent 946ce0a commit e279187

File tree

1 file changed

+5
-39
lines changed

1 file changed

+5
-39
lines changed

system/ioc/Builder.cfc

+5-39
Original file line numberDiff line numberDiff line change
@@ -265,45 +265,11 @@ component serializable="false" accessors="true" {
265265
true
266266
);
267267

268-
try {
269-
// Invoke constructor, we do this because using invoke() can be slow
270-
if ( constructorName eq "init" ) {
271-
oModel.init( argumentCollection = constructorArgCollection );
272-
} else {
273-
invoke(
274-
oModel,
275-
constructorName,
276-
constructorArgCollection
277-
);
278-
}
279-
} catch ( any e ) {
280-
var reducedTagContext = e.tagContext
281-
.reduce( function( result, file ){
282-
if ( !result.done ) {
283-
if ( file.template.listLast( "/\" ) == "Builder.cfc" ) {
284-
result.done = true;
285-
} else {
286-
result.rows.append( "#file.template#:#file.line#" );
287-
}
288-
}
289-
return result;
290-
}, { rows : [], done : false } )
291-
.rows
292-
.toList( chr( 13 ) & chr( 10 ) );
293-
294-
var throwAttributes = {
295-
type : "Builder.BuildCFCDependencyException",
296-
extendedInfo : "Current Injector -> #variables.injector.getName()#"
297-
};
298-
299-
if ( server.keyExists( "boxlang" ) ) {
300-
throwAttributes.object = e;
301-
} else {
302-
throwAttributes.message = "Error building: #arguments.mapping.getName()# -> #e.message# #e.detail#.";
303-
throwAttributes.detail = "DSL: #len( arguments.mapping.getDSL() ) ? arguments.mapping.getDSL() : "none"#; Path: #arguments.mapping.getPath()#; Error Location: #reducedTagContext#";
304-
}
305-
throw( argumentCollection = throwAttributes );
306-
}
268+
invoke(
269+
oModel,
270+
constructorName,
271+
constructorArgCollection
272+
);
307273
}
308274

309275
return oModel;

0 commit comments

Comments
 (0)