Author: fdesbois Date: 2012-09-07 10:48:22 +0200 (Fri, 07 Sep 2012) New Revision: 551 Url: http://forge.codelutin.com/repositories/revision/sammoa/551 Log: fixes #1458: NPE on flights copy Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIModel.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIModel.java 2012-09-06 15:01:45 UTC (rev 550) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/home/HomeUIModel.java 2012-09-07 08:48:22 UTC (rev 551) @@ -23,7 +23,6 @@ * #L% */ -import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import fr.ulr.sammoa.persistence.Campaign; import fr.ulr.sammoa.persistence.Flight; @@ -81,7 +80,8 @@ } public void setFlights(List<Flight> flights) { - List<Flight> oldValue = ImmutableList.copyOf(getFlights()); + // Note: Can't use ImmutableList for copy, the list contains the null flight + List<Flight> oldValue = Lists.newArrayList(getFlights()); this.flights = flights; firePropertyChange(PROPERTY_FLIGHTS, oldValue, flights); }