Merge branch 'master' into bug3378

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/Hoverline.java

Change-Id: I294dc7dc78fcab5ad4bd3ad4581fb47f530cd238
This commit is contained in:
Axel Uhl committed 2015-12-15 17:30:09 +01:00
commit dceee2da70
1 file changed
+1 -1
@@ -24,7 +24,7 @@ public class Hoverline {
this.options.setPath(polyline.getPath());
this.options.setStrokeColor(polylineOptions.getStrokeColor());
try {
this.options.setZindex(polylineOptions.getZindex());
this.options.setZindex(polylineOptions.getZindex()); // if the zindex is not set, this line throws an exception in dev mode
} catch (Exception e) {
// the Z-index of polylineOptions most likely was undefined and therefore cannot be copied (GWT DevMode problem, mostly)
}