Merge remote-tracking branch 'origin/master'

java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OfflineSerializationTest.java

@@ -6,7 +6,6 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
@@ -29,10 +28,6 @@ import com.sap.sailing.domain.common.impl.Util.Pair;
 import com.sap.sailing.domain.leaderboard.impl.ResultDiscardingRuleImpl;
 
 public class OfflineSerializationTest extends AbstractSerializationTest {
-    private static class SerializableObjectWithJavaLangObjectHashCode implements Serializable {
-        private static final long serialVersionUID = 696920899165910830L;
-    }
-    
     /**
      * Bug 769 was based on an inconsistency of a cached hash code in Pair. The same problem existed for Triple.
      * Serialization changes the Object IDs of the objects contained and therefore the hash code based on this

java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SerializableObjectWithJavaLangObjectHashCode.java

@@ -0,0 +1,7 @@
+package com.sap.sailing.domain.test;
+
+import java.io.Serializable;
+
+public class SerializableObjectWithJavaLangObjectHashCode implements Serializable {
+    private static final long serialVersionUID = 696920899165910830L;
+}

java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationServiceImpl.java

@@ -145,7 +145,7 @@ public class ReplicationServiceImpl implements ReplicationService, OperationExec
     private void broadcastOperation(RacingEventServiceOperation<?> operation) throws Exception {
         Topic topic = getReplicationTopic();
         Session session = messageBrokerManager.getSession();
-        getMessageProducer(topic).setDeliveryMode(DeliveryMode.PERSISTENT);
+        getMessageProducer(topic).setDeliveryMode(DeliveryMode.NON_PERSISTENT);
         BytesMessage operationAsMessage = session.createBytesMessage();
         // serialize operation into message
         ByteArrayOutputStream bos = new ByteArrayOutputStream();