eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-08 21:30:57 +00:00
Code Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
This commit is contained in:
fmittag committed 2013-09-12 16:08:54 +02:00
2 parents 54b7568c92 8dc72fe8be
commit 4407d11615
2 files changed
+6 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

configuration/buildAndUpdateProduct.sh
+6 -6
View File
@@ -344,11 +344,14 @@ if [[ "$@" == "install" ]] || [[ "$@" == "all" ]]; then
rm -rf $ACDIR/org.eclipse.*
rm -rf $ACDIR/configuration/org.eclipse.*
# always overwrite start and stop scripts as they
# should never contain any custom logic
cp -v $PROJECT_HOME/java/target/start $ACDIR/
cp -v $PROJECT_HOME/java/target/stop $ACDIR/
cp -v $PROJECT_HOME/java/target/status $ACDIR/
if [ ! -f "$ACDIR/env.sh" ]; then
cp -v $PROJECT_HOME/java/target/env.sh $ACDIR/
cp -v $PROJECT_HOME/java/target/start $ACDIR/
cp -v $PROJECT_HOME/java/target/stop $ACDIR/
cp -v $PROJECT_HOME/java/target/status $ACDIR/
fi
if [ ! -f $ACDIR/no-overwrite ]; then
@@ -363,9 +366,6 @@ if [[ "$@" == "install" ]] || [[ "$@" == "all" ]]; then
cp -v $PROJECT_HOME/configuration/mongodb.cfg $ACDIR/
cp -v $PROJECT_HOME/java/target/env.sh $ACDIR/
cp -v $PROJECT_HOME/java/target/start $ACDIR/
cp -v $PROJECT_HOME/java/target/stop $ACDIR/
cp -v $PROJECT_HOME/java/target/status $ACDIR/
cp -v $PROJECT_HOME/java/target/udpmirror $ACDIR/
cp -v $PROJECT_HOME/java/target/http2udpmirror $ACDIR
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
-1
View File
@@ -775,7 +775,6 @@ public class RacingEventServiceImpl implements RacingEventService, RegattaListen
for (Race race : swissTimingConnector.getRaces()) {
String raceID = race.getRaceID();
TimePoint startTime = swissTimingConnector.getStartTime(raceID);
boolean hasCourse = swissTimingConnector.hasCourse(raceID);
boolean hasStartlist = swissTimingConnector.hasStartlist(raceID);
result.add(new com.sap.sailing.domain.swisstimingadapter.RaceRecord(raceID,