Merge pull request #16 from stefaneberl/bug/TimeSync_State_Shutdown_State_Fix

Bug/time sync state shutdown state fix

Author: stefaneberl

src/main/java/com/dynatrace/openkit/core/communication/BeaconSendingTimeSyncState.java

@@ -90,7 +90,7 @@ void doExecute(BeaconSendingContext context) throws InterruptedException {
 
     @Override
     AbstractBeaconSendingState getShutdownState() {
-        return new BeaconSendingTerminalState();
+        return initialTimeSync ? new BeaconSendingTerminalState() : new BeaconSendingFlushSessionsState();
     }
 
     /**

src/test/java/com/dynatrace/openkit/core/communication/BeaconSendingTimeSyncStateTest.java

@@ -51,10 +51,10 @@ public void timeSyncStateIsNotATerminalState() {
     }
 
     @Test
-    public void getShutdownStateGivesABeaconSendingTerminalStateInstance() {
+    public void getShutdownStateGivesATerminalStateInstanceForInitialTimeSync() {
 
         // given
-        BeaconSendingTimeSyncState target = new BeaconSendingTimeSyncState();
+        BeaconSendingTimeSyncState target = new BeaconSendingTimeSyncState(true);
 
         // when
         AbstractBeaconSendingState obtained = target.getShutdownState();
@@ -64,6 +64,20 @@ public void getShutdownStateGivesABeaconSendingTerminalStateInstance() {
         assertThat(obtained, is(instanceOf(BeaconSendingTerminalState.class)));
     }
 
+    @Test
+    public void getShutdownStateGivesAFlushSessionsStateInstanceForInitialTimeSync() {
+
+        // given
+        BeaconSendingTimeSyncState target = new BeaconSendingTimeSyncState();
+
+        // when
+        AbstractBeaconSendingState obtained = target.getShutdownState();
+
+        // then
+        assertThat(obtained, is(notNullValue()));
+        assertThat(obtained, is(instanceOf(BeaconSendingFlushSessionsState.class)));
+    }
+
     @Test
     public void onInterruptedSetsCallsInitCompletedInContextOnlyForInitialTimeSync() {