Revision 45257

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/fmap/dal/feature/impl/DefaultFeatureQuery.java
603 603
        
604 604
        
605 605
        this.order = (FeatureQueryOrder) state.get("order");
606
        this.groupByColumns = new ArrayList<>((List) state.getList("groupByColumns"));
607
        this.aggregateFunctions = new HashMap<>((Map) state.getMap("aggregateFunctions"));
606
        List asListGroupByColumns = (List) state.getList("groupByColumns");
607
        if (asListGroupByColumns!=null) {
608
            this.groupByColumns = new ArrayList<>(asListGroupByColumns);
609
        } else {
610
            this.groupByColumns = null;
611
        }
612
        Map asMapAggregateFunctions = (Map) state.getMap("aggregateFunctions");
613
        if (asMapAggregateFunctions!=null) {
614
            this.aggregateFunctions = new HashMap<>(asMapAggregateFunctions);
615
        } else {
616
            this.aggregateFunctions = null;
617
        }
608 618
        this.extraColumn = (FeatureExtraColumns) state.get("extraColumn");
609 619

  
610 620
    

Also available in: Unified diff