third_codes/mapstruct
1
0
Fork 0
mirror of https://github.com/mapstruct/mapstruct.git synced 2025-07-12 00:00:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

#108 Simplify error analysis in case null is passed via model include

Browse Source
This commit is contained in:
Gunnar Morling 2014-11-07 23:02:14 +01:00 committed by Andreas Gudian
parent 0b9ca3548d
commit 44509a158e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
processor/src/main/java/org/mapstruct/ap/writer/ModelIncludeDirective.java
View File

@ -56,7 +56,9 @@ public class ModelIncludeDirective implements TemplateDirectiveModel {
DefaultModelElementWriterContext context = createContext( params );
try {
modelElement.write( context, env.getOut() );
if ( modelElement != null ) {
modelElement.write( context, env.getOut() );
}
}
catch ( TemplateException te ) {
throw te;
@ -83,13 +85,11 @@ public class ModelIncludeDirective implements TemplateDirectiveModel {
BeanModel objectModel = (BeanModel) params.get( "object" );
if ( objectModel == null ) {
throw new IllegalArgumentException(
"Object passed to this directive via the 'object' parameter must not be null"
);
return null;
}
if ( !( objectModel.getWrappedObject() instanceof Writable ) ) {
throw new IllegalArgumentException( "Given object isn't a ModelElement:" + objectModel.getWrappedObject() );
throw new IllegalArgumentException( "Given object isn't a Writable:" + objectModel.getWrappedObject() );
}
return (Writable) objectModel.getWrappedObject();