Revision 44765 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

View differences:

DefaultFeatureQuery.java
697 697 
      this.groupByColumns = null;
698 698 
    }
699 699
700 
    if( this.aggregateFunctions!=null && other.groupByColumns!=null ) {
700 
    if( this.aggregateFunctions!=null && other.aggregateFunctions!=null ) {
701 701 
      this.aggregateFunctions.clear();
702 702 
      this.aggregateFunctions.putAll(other.aggregateFunctions);
703 
    } else if( other.groupByColumns!=null ) {
703 
    } else if( other.aggregateFunctions!=null ) {
704 704 
      this.aggregateFunctions = new HashMap<>();
705 705 
      this.aggregateFunctions.putAll(other.aggregateFunctions);
706 
    } else if( this.groupByColumns!=null ) {
707 
      this.groupByColumns=null;
706 
    } else if( this.aggregateFunctions!=null ) {
707 
      this.aggregateFunctions=null;
708 708 
    }
709 709 
  }
710 710 

  		












Also available in:  Unified diff