You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2020/02/01 20:35:50 UTC

[cxf] 01/02: CXF-8207: SseEventSource loses lastEventId on the 2nd reconnect attempt

This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit f3bb0611efda7450fad2d1e4cc47d8c8583dbb38
Author: reta <dr...@gmail.com>
AuthorDate: Sat Feb 1 13:31:02 2020 -0500

    CXF-8207: SseEventSource loses lastEventId on the 2nd reconnect attempt
    
    (cherry picked from commit df0e67ea2e3233a83c59cb5e9d613aee045de705)
    (cherry picked from commit b10905c1a58674e68dfb6c888a730cb7ba7b6e74)
    
    # Conflicts:
    #	rt/rs/sse/src/test/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImplTest.java
---
 .../java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImpl.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImpl.java b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImpl.java
index f0c2acf..4e8ede2 100644
--- a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImpl.java
+++ b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImpl.java
@@ -63,6 +63,10 @@ public class SseEventSourceImpl implements SseEventSource {
     private class InboundSseEventListenerDelegate implements InboundSseEventListener {
         private String lastEventId;
         
+        InboundSseEventListenerDelegate(String lastEventId) {
+            this.lastEventId = lastEventId;
+        }
+        
         @Override
         public void onNext(InboundSseEvent event) {
             lastEventId = event.getId();
@@ -180,7 +184,7 @@ public class SseEventSourceImpl implements SseEventSource {
     }
 
     private void connect(String lastEventId) {
-        final InboundSseEventListenerDelegate delegate = new InboundSseEventListenerDelegate();
+        final InboundSseEventListenerDelegate delegate = new InboundSseEventListenerDelegate(lastEventId);
         Response response = null;
         
         try {