Commit Graph
22451 Commits
Author SHA1 Message Date
Axel Uhl ae53d23cc1 adjusted versions in feature.xml, particularly of mongodb.driver and gwt.osgi 2015-03-30 16:24:21 +02:00
Axel Uhl 21bb26ca71 Merge branch 'master' into bug2743 2015-03-30 14:02:08 +02:00
Axel Uhl 19a70efd34 Merge remote-tracking branch 'server/master' 2015-03-30 13:20:11 +02:00
Axel Uhl b5ea074217 fixing deserialization for new raceStates weak hash map in TrackedRaceImpl 2015-03-30 13:16:38 +02:00
Alexander Ries 25c6fb0052 Merge remote-tracking branch 'origin/master' into ribdashboard 2015-03-30 13:02:59 +02:00
Alexander Ries 4034db48cc removed possible null pointer in ribdashboardservice when loading competitors from leaderboard 2015-03-30 13:00:42 +02:00
Axel Uhl 9001649b99 fixed waiting on Replicator's queue to become empty; this avoids the AlreadyClosedExceptions, it seems, but the testWindSourcesToExcludeReplication test still fails locally 2015-03-30 11:50:48 +02:00
Axel Uhl b823ed058b Merge branch 'master' into bug2743 2015-03-30 10:45:24 +02:00
Axel Uhl b8ef26800f improved replication test logging; improved Javadoc for RaceTracker.stop(...) 2015-03-30 10:44:08 +02:00
Axel Uhl aa0ed9e815 partly reverting commit 21d5d33f78 to see what is causing the issue in Hudson 2015-03-30 10:10:07 +02:00
Axel Uhl 4f18c1c366 use any free server port for replication servlet in test mode 2015-03-30 02:09:38 +02:00
Axel Uhl 3f72d71201 Merge branch 'master' into mark-rounding-inference 2015-03-29 22:19:11 +02:00
Axel Uhl 1b6688d24a trying to provide a solution for bug 2741 by re-structuring how a start-covering edge is assigned a cost based on difference to start time and distance comparison 2015-03-29 22:03:36 +02:00
Axel Uhl 9b2c41b32d some refactoring in CandidateChooserImpl to make code more readable and re-usable 2015-03-29 21:31:31 +02:00
Axel Uhl 7b3f8722be extended the wait time for replication test even more; locally it was green for 2s wait time... 2015-03-29 21:22:06 +02:00
Axel Uhl 06872cc3ec Merge branch 'master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
2015-03-29 20:11:01 +02:00
Axel Uhl 3e689182a6 increased timeouts for previously failing replication tests; green now locally 2015-03-29 19:50:31 +02:00
Axel Uhl 023731f84f fixing bug regarding replication of tracked race live delay: the change of a fixed delay wasn't properly notified to listeners, therefore not replicated 2015-03-29 18:30:03 +02:00
Axel Uhl 21d5d33f78 fixing re-opened bug 2707, now also for replication-related de-serialization in RacingEventServiceImpl, using the same class loader 2015-03-29 18:00:07 +02:00
Axel Uhl 297f91a098 Merge branch 'master' into mark-rounding-inference 2015-03-29 17:37:34 +02:00
Axel Uhl cd86e0b13d fix for bug 2742: recognize gate start by not applying fallback racing procedure but only actual racing procedure specifications 2015-03-29 17:23:52 +02:00
fmittag 797a9fc78f changed copyright info in footer to 2015 2015-03-29 10:37:55 +02:00
Axel Uhl ec066db3ac try to make tests run again; need a more sophisticated fix for bug 2741 2015-03-27 23:29:51 +01:00
Axel Uhl 65f8d322f9 Merge branch 'master' into mark-rounding-inference 2015-03-27 21:49:02 +01:00
Axel Uhl 7f74657fe9 added / improved comments 2015-03-27 21:48:45 +01:00
Axel Uhl 90fe698ab4 fixed sign issue: distances can be negative if they are computed relative to a line; need to use absolute value 2015-03-27 21:48:37 +01:00
Axel Uhl a865100dda avoid NPE by comparing Boolean to Boolean.TRUE, avoiding auto-unboxing of null value 2015-03-27 21:47:55 +01:00
Axel Uhl 2a3bc02d35 added / improved comments 2015-03-27 21:28:14 +01:00
Axel Uhl ac57f14c1c fixed sign issue: distances can be negative if they are computed relative to a line; need to use absolute value 2015-03-27 19:19:13 +01:00
Axel Uhl 7374531f98 avoid NPE by comparing Boolean to Boolean.TRUE, avoiding auto-unboxing of null value 2015-03-27 19:02:41 +01:00
Lennart Hensler 29c2a987ef Merge remote-tracking branch 'origin/master' into dataMining 2015-03-27 18:27:54 +01:00
Axel Uhl 3696888b98 fix for bug 2714 except for gate start: evaluating time gap between start time and start mark passing candidate --> closer means higher probability 2015-03-27 18:13:13 +01:00
Axel Uhl 7fb7a09188 tiny fix in toString reprensetation of CandidateImpl 2015-03-27 16:58:17 +01:00
Axel Uhl fd0f6eadcf fixed use of time point from fixed mark passing specification when reading from race log; minor refactoring saving a few HashMap look-ups 2015-03-27 16:28:50 +01:00
Axel Uhl ba47883a59 Merge branch 'master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingUpdateListener.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
2015-03-27 15:39:19 +01:00
Axel Uhl 3bfe5c149a added short info to mark passing-related race log events; formatting; refactored common parts in CandidateFinderImpl 2015-03-27 15:36:59 +01:00
Frederik Petersen 631fab42ea Merge branch 'master' into bug2729 2015-03-27 15:31:08 +01:00
Axel Uhl 74e82c806c Merge branch 'master' into mark-rounding-inference 2015-03-27 14:23:04 +01:00
Axel Uhl 7bbd9cf472 removed offending flag image 2015-03-27 14:21:56 +01:00
Axel Uhl 226b2da89b in streamlet updates related to wind track resolution checks 2015-03-27 09:47:57 +01:00
Axel Uhl 26ad184a9f fixing simulator issue with loading finished callbacks; loading finished callbacks are now notified immediately when simulator is running 2015-03-26 17:50:19 +01:00
Axel Uhl 9570a5d3f0 allow multiple loading completion listeners to subscribe at the same last event in queue 2015-03-26 17:41:47 +01:00
Axel Uhl 1d4d9640a0 also wait for queues to drain in TracTrac connector in non-preemptive stop(...) call 2015-03-26 16:54:11 +01:00
Axel Uhl 878b90eb89 perform check for completeness and status change from LOADING to TRACKING *after* setting the default LOADING state 2015-03-26 16:51:18 +01:00
Axel Uhl ce4fabbaf2 Merge branch 'master' into bug2729 2015-03-26 16:36:49 +01:00
Axel Uhl 2bab13901d use only fixes between start end end of tracking for mark passing calculation; preparing for a solution for bug 2737, allowing explicit start/endOfTracking to be set for a race 2015-03-26 15:58:30 +01:00
Axel Uhl 275c208b57 avoid NPE in XTE calculation of CandidateFinderImpl 2015-03-26 15:43:13 +01:00
Axel Uhl d07ca4a2ea complete fixing StringMessages after merge issues 2015-03-26 15:38:53 +01:00
Axel Uhl d1334aaed1 restored StringMessages after massive merge problems 2015-03-26 15:37:27 +01:00
Axel Uhl 8d8ae6f16c fixed merge issues such as references to the security infrastructure that changed 2015-03-26 15:01:40 +01:00