Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~bjorn/design into release/10.0

designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java

@@ -56,18 +56,19 @@ public class VanChartCommonMarkerPane extends BasicBeanPane<VanChartAttrMarker>
         return normalMarkers;
     }
 
+    private static Marker[] normalMarkersWithAuto = null;
     protected static Marker[] getNormalMarkersWithAuto() {
-        if (normalMarkers == null) {
-            normalMarkers = new Marker[NORMAL_TYPES.length + 1];
-            normalMarkers[0] = Marker.createMarker(MarkerType.MARKER_AUTO);
+        if (normalMarkersWithAuto == null) {
+            normalMarkersWithAuto = new Marker[NORMAL_TYPES.length + 1];
+            normalMarkersWithAuto[0] = Marker.createMarker(MarkerType.MARKER_AUTO);
 
             int i = 1;
 
             for (MarkerType markerType : NORMAL_TYPES) {
-                normalMarkers[i++] = Marker.createMarker(markerType);
+                normalMarkersWithAuto[i++] = Marker.createMarker(markerType);
             }
         }
-        return normalMarkers;
+        return normalMarkersWithAuto;
     }
 
     //没有无这个选项