Author: tchemit Date: 2010-02-07 12:40:13 +0100 (Sun, 07 Feb 2010) New Revision: 1733 Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/JXPathDecorator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/OneClicListSelectionModel.java Log: Anomalie #302: Fix NPE in Decorator sort when context data is null Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/JXPathDecorator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/JXPathDecorator.java 2010-02-01 01:40:24 UTC (rev 1732) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/JXPathDecorator.java 2010-02-07 11:40:13 UTC (rev 1733) @@ -156,6 +156,15 @@ public int compare(O o1, O o2) { Comparable<Comparable<?>> c1 = valueCache.get(o1); Comparable<Comparable<?>> c2 = valueCache.get(o2); + if (c1 == null) { + if (c2 == null) { + return 0; + } + return 1; + } + if (c2 == null) { + return -1; + } return c1.compareTo(c2); } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/OneClicListSelectionModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/OneClicListSelectionModel.java 2010-02-01 01:40:24 UTC (rev 1732) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/OneClicListSelectionModel.java 2010-02-07 11:40:13 UTC (rev 1733) @@ -34,7 +34,7 @@ */ public class OneClicListSelectionModel implements ListSelectionModel { - /** to use log facility, just put in your code: log.info("..."); */ + /** Logger */ static private Log log = LogFactory.getLog(OneClicListSelectionModel.class); protected ListSelectionModel delegate; protected final ListModel model;