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/12/13 16:18:17 UTC
[cxf] branch 3.2.x-fixes updated (af67802 -> 77bd18b)
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 af67802 Update to Spring Framework 4.3.30.RELEASE
new b961732 CXF-7988: SSE sink warning on tomcat
new 77bd18b 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 | 10 ++++++++++
.../java/org/apache/cxf/jaxrs/sse/SseEventSinkImpl.java | 14 ++++++++------
2 files changed, 18 insertions(+), 6 deletions(-)
[cxf] 01/02: CXF-7988: SSE sink warning on tomcat
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 b96173264fe1ce8ee8cbecd226abb2044aebef22
Author: reta <dr...@gmail.com>
AuthorDate: Sun Dec 13 10:02:34 2020 -0500
CXF-7988: SSE sink warning on tomcat
(cherry picked from commit c239bd3b18253fbdaf9b2bd2322a29452d5473d6)
(cherry picked from commit 572118287c994ebcb69422c3dac27dbcedffaa06)
---
.../java/org/apache/cxf/jaxrs/sse/SseEventSinkImpl.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseEventSinkImpl.java b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseEventSinkImpl.java
index d515e84..9e2c88f 100644
--- a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseEventSinkImpl.java
+++ b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseEventSinkImpl.java
@@ -146,7 +146,7 @@ public class SseEventSinkImpl implements SseEventSink {
ctx.complete();
}
} catch (final IllegalStateException ex) {
- LOG.warning("Failed to close the AsyncContext cleanly: " + ex.getMessage());
+ LOG.fine("Failed to close the AsyncContext cleanly: " + ex.getMessage());
}
}
@@ -264,17 +264,19 @@ public class SseEventSinkImpl implements SseEventSink {
// it inside the onError() callback. However, most of the servlet containers
// do not handle this case properly (and onError() is not called).
if (shouldComplete && completed.compareAndSet(false, true)) {
- LOG.warning("Prematurely completing the AsyncContext due to error encountered: " + error);
+ LOG.fine("Prematurely completing the AsyncContext due to error encountered: " + error);
// In case of Tomcat, the context is closed automatically when client closes
// the connection and onError callback will be called (in this case request
// is set to null).
- if (ctx.getRequest() != null) {
+ try {
LOG.fine("Completing the AsyncContext");
- try {
+ // Older versions of Tomcat returned 'null', now the getRequest() throws
+ // IllegalStateException if it is 'null'.
+ if (ctx.getRequest() != null) {
ctx.complete();
- } catch (final IllegalStateException ex) {
- LOG.warning("Failed to close the AsyncContext cleanly: " + ex.getMessage());
}
+ } catch (final IllegalStateException ex) {
+ LOG.fine("Failed to close the AsyncContext cleanly: " + ex.getMessage());
}
}
}
[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 77bd18b82d2350f3c349d5bae225173e93be75f2
Author: reta <dr...@gmail.com>
AuthorDate: Sun Dec 13 11:17:37 2020 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index b4e47d0..e2ad3f7 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -463,11 +463,13 @@ B 74ab648ebd678e5d23365507a78f1429540f63fd
B 7524dc4de94dbe3b41545885250e36581f0c28be
B 752f397670fa46346811f969ad87e2aca57f4c34
B 754223f87930b2a98f80f0f4325069d8f67f3114
+B 754acf4f5a0bafb8a9512a011c69554eaa030aa8
B 75553f8ba7a83b4391044ff7db8d2f5e05bcbc2a
B 770edd80070bcd035c47746be34f801b1f45a7ee
B 776ffeb07d046c6e3e52e9234218f87be789d348
B 77a6621d6333f1b64a9fdf45e027ad3a4db86b01
B 77af6d441bb489e2378a52e08f85da192fd79ca3
+B 77e58d213a929a481d0ceebecdac5fc5db62a9b3
B 78153648e314266ef3147c043e1841cb2f1ec316
B 78e1f9b340a172423b0c0f26ab8b00e04d8f47df
B 78fed1f163b609d2b091385abde5a841868f18dd
@@ -662,6 +664,7 @@ B ab2013cec7d0548023a2ec23dc874f18b36c2c73
B ab2349a4ad1f2eabf562b897b145c77b62b7b2ae
B ab2a445759124dd874787bcf99efbfa462ebb126
B abb7a250188c1a2aa52277d369bb8968bd1d0188
+B aca08f8531c28820abca89dcfae7f867f7a1af17
B aca3a18b2fb5cae542d8a34f3c804fb0dc02ce73
B acc697f1c88f392bd952e07d50a9ae2ce0b76411
B ad27755270c649ab64f2cec0d3768772ef68fc1f
@@ -717,6 +720,7 @@ B bbd28b4e7e38ac27d4ea941b703d5a253ceb4e48
B bbe640de94faba94819074234cf4b6a8b637df75
B bc1a22503447649e7991f4b8f3368a90deb42a7d
B bc1a8f581a0cf3930db9086c6b6d8a795b44684b
+B bc474d170829b6ec33a1aa1ea9f3279683f15564
B bc7d9c0b017be38c7aa066eaad179cb6df7ef4ab
B bca53bff89b0d18dea275847fcfa84b2a495acce
B bcd5339dc3dd41e9a8d07c4b9e5d6913833883b3
@@ -876,6 +880,7 @@ B e463aa01e224ca09a99a4fc1d4db376d05f1918b
B e512ce803e388e93a9fd601d11c455b2e535ca7d
B e513ba8cc4c597b8c6248d470f03b2d05c738680
B e5ebac14b42b283f569fbab7f6f5f0ad2c35346f
+B e61e481d1b014f01b366df7d1cf2f77c8a400962
B e63ce74570117d17552c5cfe9823bc93237583f2
B e690a8446daef5cf1bc25cdbcbcfb3463ffc7bf5
B e6b7675f45d6155d46725557cc0669810923d15e
@@ -1010,6 +1015,7 @@ M 1cc03b9b70bc509d8f8c631563c3964e56e30621
M 1cdf673a8ce2fc5c57318d1a102ca0923cb1d945
M 1e3fd1c91e677497cb4e4a3f7e7f3a42c86fe0b0
M 1f0468398ddb21ecaf6b6eda370e3464e402ef8a
+M 2133410a9c80858a848fde99167d5c9cb9677aa5
M 22678a4c84225e46825e256acdbfbbdc7bed5637
M 22c4d655196dbe49ef6a4d81b3619ac65508102a
M 23f9204b9d0e01738e8100f0152baf53320d98f8
@@ -1063,6 +1069,7 @@ M 56f74c18d7c709307b174cb211b28e4384574e9b
M 57f8c554b04af4e06b4e97bb349cbb8adeeb7acc
M 5827b0bb9d5a62f420f5277ffa456fd8a6083ab0
M 58cc0cd69c4274cb1bbff531107ff2db6f434d67
+M 593848e42476df586bec308558635b588e098a11
M 59f52b309db7fdca59f3f9293748efd07c0f74d9
M 5a32c59aebefafe4731ebefdeb6e378ac5c97015
M 5a4fd020bc87a552345425541bb62a35b0e5d8b7
@@ -1116,6 +1123,7 @@ M 9853d0932fbfcb3753a01d8604d27ce4678c892c
M 98ec361acd390483005de12ca3b10cf49cbdcf8a
M 99028cc48e200ea0c36fe2bee87bf813e513a513
M 9a2f1212cd7031c8447ae4294c4c4ccc7322d9e5
+M 9a7b732fda75596663c6e195af796941779638fe
M 9ab0d2766695a2ba9f1ed1ca042b5d2a42eb4fd9
M 9ad4ecac3c5444fc08e9d48cc5a1c60e4bb02b4c
M 9bca6952c145b6ec6d2fb5726676ad7c3d67b7f7
@@ -1163,8 +1171,10 @@ M cefb63933c70cda9ce78681f0c0fb48a31ca5a5a
M d1315732be55b89c25f66213d1f0a0e0567d8abc
M d13c65872b9c98ec428d018717d72907d6918b03
M d1470dd0e14aa001dde1227bfb456a8b4cf0061e
+M d3162ec9c7d570beee43c7c51637db20939310a7
M d419ae389ab4b42bf57106db99758dd8d3b11bca
M d520059ce1d04448fb2354966a7e16b39c3fcbda
+M d5d48ac27f5d9dc090bcbc8135c02def77378541
M dd11a60cc247b261ab96c7dfd314eff571e03eef
M ddc60b9a8fdb6bba939c30c8d3635c6ae26175d7
M e0957d83bb65f2ddd36e4c6a49ef1ca3b68581ca