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

Merge remote-tracking branch 'origin/master' into dataMining

Browse Source
This commit is contained in:
Lennart Hensler committed 2014-03-07 10:00:04 +01:00
2 parents 97cf2804ad d06ed7dfc9
commit 5f552b46b8
2 files changed
+4 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

configuration/buildAndUpdateProduct.sh
+2
View File
@@ -652,6 +652,8 @@ if [[ "$@" == "remote-deploy" ]]; then
$SCP_CMD $p2PluginRepository/configuration/config.ini $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/configuration/
$SCP_CMD $PROJECT_HOME/java/target/configuration/jetty/etc/jetty.xml $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/configuration/jetty/etc
$SCP_CMD $PROJECT_HOME/java/target/configuration/jetty/etc/jetty-selector.xml $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/configuration/jetty/etc
$SCP_CMD $PROJECT_HOME/java/target/configuration/jetty/etc/jetty-deployer.xml $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/configuration/jetty/etc
$SCP_CMD $PROJECT_HOME/java/target/configuration/jetty/etc/realm.properties $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/configuration/jetty/etc
$SCP_CMD $PROJECT_HOME/java/target/configuration/monitoring.properties $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/configuration/
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/EventBaseJsonDeserializer.java
+2 -1
View File
@@ -26,7 +26,8 @@ public class EventBaseJsonDeserializer implements JsonDeserializer<EventBase> {
Number endDate = (Number) object.get(EventJsonSerializer.FIELD_END_DATE);
JSONObject venueObject = Helpers.getNestedObjectSafe(object, EventJsonSerializer.FIELD_VENUE);
Venue venue = venueDeserializer.deserialize(venueObject);
return new EventBaseImpl(name, new MillisecondsTimePoint(startDate.longValue()), new MillisecondsTimePoint(endDate.longValue()),
return new EventBaseImpl(name, new MillisecondsTimePoint(startDate != null ? startDate.longValue() : 0), new MillisecondsTimePoint(endDate != null ? endDate.longValue() : 1),
venue, true, id);
}