Author: tchemit Date: 2012-12-10 04:05:59 +0100 (Mon, 10 Dec 2012) New Revision: 1217 Url: http://nuiton.org/projects/eugene/repository/revisions/1217 Log: fixes #2466: NPE when using available-data with no parameter Modified: trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java Modified: trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java =================================================================== --- trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java 2012-12-10 00:29:12 UTC (rev 1216) +++ trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java 2012-12-10 03:05:59 UTC (rev 1217) @@ -91,6 +91,7 @@ protected Map<String, Model> modelTypes; /** All available writers introspects via plexus. */ + @Component(role = ModelReader.class) protected Map<String, ModelReader<?>> modelReaders; /** All available templates introspects via plexus. */ @@ -217,21 +218,23 @@ } else { Map<String, ?> map = data.getData(this); - int size = map.size(); + int size = map == null ? 0 : map.size(); if (size == 0) { buffer.append("\nNo available ").append(dataType).append("."); - } else if (size == 1) { - buffer.append("\nFound one ").append(dataType).append(" : "); } else { - buffer.append("\nFound "); - buffer.append(size); - buffer.append(" "); - buffer.append(dataType); - buffer.append("s : "); + if (size == 1) { + buffer.append("\nFound one ").append(dataType).append(" : "); + } else { + buffer.append("\nFound "); + buffer.append(size); + buffer.append(" "); + buffer.append(dataType); + buffer.append("s : "); + } + for (Map.Entry<String, ?> e : map.entrySet()) { + data.toString(buffer, e); + } } - for (Map.Entry<String, ?> e : map.entrySet()) { - data.toString(buffer, e); - } } }