Author: nbelaevski Date: 2007-08-31 10:01:17 -0400 (Fri, 31 Aug 2007) New Revision: 2656 Modified: trunk/cdk/generator/src/main/resources/META-INF/templates/componentTag.vm trunk/cdk/generator/src/main/resources/META-INF/templates/tag.vm trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm trunk/cdk/generator/src/main/resources/META-INF/templates12/tag.vm Log: NPE on null non-el attributes fixed Modified: trunk/cdk/generator/src/main/resources/META-INF/templates/componentTag.vm =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/templates/componentTag.vm 2007-08-31 13:42:07 UTC (rev 2655) +++ trunk/cdk/generator/src/main/resources/META-INF/templates/componentTag.vm 2007-08-31 14:01:17 UTC (rev 2656) @@ -78,7 +78,7 @@ #foreach( $prop in $component.properties ) #if( !$prop.existintag ) #if(!$prop.el) - if(isValueReference(this._${prop.name})){ + if(null != this._${prop.name} && isValueReference(this._${prop.name})){ throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext()) +" not allowed EL expression for property ${prop.name}"); } #end Modified: trunk/cdk/generator/src/main/resources/META-INF/templates/tag.vm =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/templates/tag.vm 2007-08-31 13:42:07 UTC (rev 2655) +++ trunk/cdk/generator/src/main/resources/META-INF/templates/tag.vm 2007-08-31 14:01:17 UTC (rev 2656) @@ -83,7 +83,7 @@ #foreach( $prop in $component.properties ) #if( !$prop.existintag ) #if(!$prop.el) - if(isValueReference(this._${prop.name})){ + if(null != this._${prop.name} && isValueReference(this._${prop.name})){ throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext()) +" not allowed EL expression for property ${prop.name}"); } #end Modified: trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm 2007-08-31 13:42:07 UTC (rev 2655) +++ trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm 2007-08-31 14:01:17 UTC (rev 2656) @@ -78,7 +78,7 @@ #foreach( $prop in $component.properties ) #if( !$prop.existintag ) #if(!$prop.el) - if(isValueReference(this._${prop.name})){ + if(null != this._${prop.name} && isValueReference(this._${prop.name})){ throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext()) +" not allowed EL expression for property ${prop.name}"); } #end Modified: trunk/cdk/generator/src/main/resources/META-INF/templates12/tag.vm =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/templates12/tag.vm 2007-08-31 13:42:07 UTC (rev 2655) +++ trunk/cdk/generator/src/main/resources/META-INF/templates12/tag.vm 2007-08-31 14:01:17 UTC (rev 2656) @@ -83,7 +83,7 @@ #foreach( $prop in $component.properties ) #if( !$prop.existintag ) #if(!$prop.el) - if(isValueReference(this._${prop.name})){ + if(null != this._${prop.name} && isValueReference(this._${prop.name})){ throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext()) +" not allowed EL expression for property ${prop.name}"); } #end