modules/controls/src/main/java/javafx/scene/chart/XYChart.java

rev 9945 : 8089755: AreaChart area color change when series is removed

@@ -135,12 +135,10 @@
             }
 
             for (Series<X,Y> s : c.getRemoved()) {
                 s.setToRemove = true;
                 seriesRemoved(s);
-                int idx = seriesColorMap.remove(s);
-                colorBits.clear(idx);
             }
 
             for(int i=c.getFrom(); i<c.getTo() && !c.wasPermutated(); i++) {
                 final Series<X,Y> s = c.getList().get(i);
                 // add new listener to data

@@ -881,10 +879,12 @@
      */
     protected final void removeSeriesFromDisplay(Series<X, Y> series) {
         if (series != null) series.setToRemove = false;
         series.setChart(null);
         displayedSeries.remove(series);
+        int idx = seriesColorMap.remove(series);
+        colorBits.clear(idx);
     }
 
     /**
      * XYChart maintains a list of all series currently displayed this includes all current series + any series that
      * have recently been deleted that are in the process of being faded(animated) out. This creates and returns a