Author: kwin Date: Fri Jan 30 11:01:53 2015 New Revision: 1655986 URL: http://svn.apache.org/r1655986 Log: SLING-4373 throw IAE in case null is given as parameter to createModel
Modified: sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java Modified: sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java?rev=1655986&r1=1655985&r2=1655986&view=diff ============================================================================== --- sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java (original) +++ sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java Fri Jan 30 11:01:53 2015 @@ -189,6 +189,12 @@ public class ModelAdapterFactory impleme @Override public <ModelType> ModelType createModel(Object adaptable, Class<ModelType> type) throws MissingElementsException, InvalidAdaptableException, InvalidValidationModelException, InvalidResourceException { + if (adaptable == null) { + throw new IllegalArgumentException("Given adaptable is null!"); + } + if (type == null) { + throw new IllegalArgumentException("Given type is null"); + } Result<ModelType> result = internalCreateModel(adaptable, type); result.throwException(log); return result.getModel();