Author: fdesbois Date: 2010-01-05 10:49:58 +0100 (Tue, 05 Jan 2010) New Revision: 1744 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java Log: Fix NPE when loadProperty Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-01-04 11:21:29 UTC (rev 1743) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-01-05 09:49:58 UTC (rev 1744) @@ -914,7 +914,7 @@ if (log.isTraceEnabled()) { log.trace("load property '" + property + "' for '" + entity.getClass().getSimpleName() + "'"); } - if (Collection.class.isAssignableFrom(res.getClass())) { + if (res != null && Collection.class.isAssignableFrom(res.getClass())) { Collection list = (Collection) res; list.size(); }