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:49 UTC
[cxf] branch 3.2.x-fixes updated (97671da -> f9edcbf)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 97671da Removing unused import
new f3bb061 CXF-8207: SseEventSource loses lastEventId on the 2nd reconnect attempt
new f9edcbf Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 1 +
.../java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImpl.java | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
[cxf] 01/02: CXF-8207: SseEventSource loses lastEventId on the 2nd
reconnect attempt
Posted by re...@apache.org.
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 {
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
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 f9edcbff0490408e523e91aef7508097d16ef573
Author: reta <dr...@gmail.com>
AuthorDate: Sat Feb 1 15:35:18 2020 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 41d0b76..144aa72 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -906,6 +906,7 @@ M acdd218586244ed0bc64f5ea69ae0b694584b698
M ad5c6ad246f9155fec7096de7701de02d757c0f2
M ade931373e70e8dbe720c8ba036f5d72152b3f59
M af6a95f5b7efc141cc55792e10d05d471905cf32
+M b10905c1a58674e68dfb6c888a730cb7ba7b6e74
M b9300944381ebe10f7c5fe86d55b25b8292372fd
M ba4896378eeb0c01152ea09ae0bdd3e123207736
M beeb13f0c08cdbdfa63e0bf2d4d2177d79778d56