From 9db11ef18667d6342aa0c55a812fbdebbf379a29 Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Tue, 28 Feb 2012 18:16:44 +0100
Subject: [PATCH] moved null check; added synchronization to avoid concurrency
 issues when debugging in Java VM

---
 .../sap/sailing/gwt/ui/leaderboard/AbstractChartPanel.java  | 2 +-
 .../sailing/gwt/ui/shared/controls/slider/SliderBar.java    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/AbstractChartPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/AbstractChartPanel.java
index abdc4ca89e8..ff8ca5c0da8 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/AbstractChartPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/AbstractChartPanel.java
@@ -523,7 +523,7 @@ implements CompetitorSelectionChangeListener, RaceSelectionChangeListener, TimeL
         if (getChartData() != null) {
             Date newestEvent = getChartData().getOldestDateOfNewestData();
             if (hasVisibleCompetitors()
-                    && ((newestEvent.before(date) && (date.getTime() - newestEvent.getTime()) >= getStepSize()) || newestEvent == null)) {
+                    && (newestEvent == null || (newestEvent.before(date) && (date.getTime() - newestEvent.getTime()) >= getStepSize()))) {
                 loadData(false);
             }
         }
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/controls/slider/SliderBar.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/controls/slider/SliderBar.java
index 6913e8c4b69..ebd011b6dfa 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/controls/slider/SliderBar.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/controls/slider/SliderBar.java
@@ -636,7 +636,7 @@ public class SliderBar extends FocusPanel implements RequiresResize, HasValue<Do
      * @param curValue
      *            the current value
      */
-    public void setCurrentValue(Double curValue) {
+    public synchronized void setCurrentValue(Double curValue) {
         setCurrentValue(curValue, true);
     }
 
@@ -648,7 +648,7 @@ public class SliderBar extends FocusPanel implements RequiresResize, HasValue<Do
      * @param fireEvent
      *            fire the onValue change event if true
      */
-    public void setCurrentValue(Double curValue, boolean fireEvent) {
+    public synchronized void setCurrentValue(Double curValue, boolean fireEvent) {
         // Confine the value to the range
         if (!isMinMaxInitialized() || curValue == null) {
             return;
@@ -1088,7 +1088,7 @@ public class SliderBar extends FocusPanel implements RequiresResize, HasValue<Do
     /**
      * Reset the progress to constrain the progress to the current range and redraw the knob as needed.
      */
-    private void resetCurrentValue() {
+    private synchronized void resetCurrentValue() {
         setCurrentValue(getCurrentValue());
     }