From a99f7453fc8e0add0388225f4aa8c7efc10b5b55 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Fri, 7 Dec 2018 09:01:47 +0100 Subject: [PATCH 1/2] in env.sh defaults, set -Drestore.tracked.races=true; in start script added -Xms$MEMORY Change-Id: Ia410b4aaf987c14e26eec7cbb18df77d8d5a7b0f --- java/target/env.sh | 2 +- java/target/start | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/target/env.sh b/java/target/env.sh index 966c32aa33d..a873432adea 100755 --- a/java/target/env.sh +++ b/java/target/env.sh @@ -123,7 +123,7 @@ else JAVA_VERSION_SPECIFIC_ARGS=$JAVA_8_ARGS fi echo JAVA_VERSION_SPECIFIC_ARGS are: $JAVA_VERSION_SPECIFIC_ARGS -ADDITIONAL_JAVA_ARGS="$JAVA_VERSION_SPECIFIC_ARGS $ADDITIONAL_JAVA_ARGS -Dpersistentcompetitors.clear=false -XX:MaxGCPauseMillis=500" +ADDITIONAL_JAVA_ARGS="$JAVA_VERSION_SPECIFIC_ARGS $ADDITIONAL_JAVA_ARGS -Dpersistentcompetitors.clear=false -Drestore.tracked.races=true -XX:MaxGCPauseMillis=500" # options for use with SAP JVM only: if "$JAVA_BINARY" -version 2>&1 | grep -q "SAP Java"; then echo SAP JVM detected diff --git a/java/target/start b/java/target/start index bcbdbedbead..8ed9853c388 100755 --- a/java/target/start +++ b/java/target/start @@ -23,7 +23,7 @@ if [[ ! -d "$JAVA_HOME" ]]; then fi # disable AWT requiring X11 and the correct DISPLAY variable setting; failing to do so # can result in trouble generating QR codes in the back-end -ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Djava.awt.headless=true" +ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Djava.awt.headless=true -Xms$MEMORY" PLATFORM=`uname` SED_ARGS="-i" if [[ $PLATFORM == "Darwin" ]]; then From 4eef1fc182632789a60152b5660703758d9f62f4 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Fri, 7 Dec 2018 09:13:20 +0100 Subject: [PATCH 2/2] fixed issues with BoatClassSerializer in case no additional data is present Change-Id: I0858788ddcd786e60bc8dcde7dd5183a79c8dd0f --- .../impl/BoatClassJsonSerializer.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/BoatClassJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/BoatClassJsonSerializer.java index ee5807a9a7f..2331c47d748 100644 --- a/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/BoatClassJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/BoatClassJsonSerializer.java @@ -23,14 +23,20 @@ public class BoatClassJsonSerializer implements JsonSerializer { JSONObject result = new JSONObject(); result.put(FIELD_NAME, boatClass.getName()); result.put(FIELD_TYPICALLY_STARTS_UPWIND, boatClass.typicallyStartsUpwind()); - result.put(FIELD_HULL_LENGTH_IN_METERS, boatClass.getHullLength().getMeters()); - result.put(FIELD_HULL_BEAM_IN_METERS, boatClass.getHullBeam().getMeters()); - result.put(FIELD_DISPLAY_NAME, boatClass.getDisplayName()); - final BoatClassMasterdata masterData = BoatClassMasterdata.resolveBoatClass(boatClass.getDisplayName()); + if (boatClass.getHullLength() != null) { + result.put(FIELD_HULL_LENGTH_IN_METERS, boatClass.getHullLength().getMeters()); + } + if (boatClass.getHullBeam() != null) { + result.put(FIELD_HULL_BEAM_IN_METERS, boatClass.getHullBeam().getMeters()); + } final JSONArray aliasNames = new JSONArray(); - if (masterData != null) { - result.put(FIELD_ICON_URL, "/gwt/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/"+masterData.name().replaceAll("^_", "")+".png"); - aliasNames.addAll(Arrays.asList(masterData.getAlternativeNames())); + if (boatClass.getDisplayName() != null) { + result.put(FIELD_DISPLAY_NAME, boatClass.getDisplayName()); + final BoatClassMasterdata masterData = BoatClassMasterdata.resolveBoatClass(boatClass.getDisplayName()); + if (masterData != null) { + result.put(FIELD_ICON_URL, "/gwt/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/"+masterData.name().replaceAll("^_", "")+".png"); + aliasNames.addAll(Arrays.asList(masterData.getAlternativeNames())); + } } result.put(FIELD_ALIAS_NAMES, aliasNames); return result;