You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/10/16 12:02:04 UTC
[cxf] branch 3.2.x-fixes updated (0d57fc0 -> 6bf4869)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 0d57fc0 Updating Spring
new d40da6a CXF-7869 - Infinite loop in rest client
new d312b28 Recording .gitmergeinfo Changes
new 8171ae4 Recording .gitmergeinfo Changes
new 6bf4869 introduce getStreamResult to allow override, e.g. for pdf generation using apache fop
The 4 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 | 9 +++++++++
.../org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java | 6 +++++-
.../java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java | 15 +++++++++------
3 files changed, 23 insertions(+), 7 deletions(-)
[cxf] 04/04: introduce getStreamResult to allow override,
e.g. for pdf generation using apache fop
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 6bf4869e23f55e28d051e0e44a6910ac7b3868e2
Author: slavb18 <sl...@gmail.com>
AuthorDate: Wed Aug 22 10:22:10 2018 +0400
introduce getStreamResult
to allow override, e.g. for pdf generation using apache fop
(cherry picked from commit 455938206f6fe0f5e9717c4a6363d4d11fd414b5)
---
.../main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
index e91f88e..5c03be4 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
@@ -337,6 +337,10 @@ public class XSLTJaxbProvider<T> extends JAXBElementProvider<T> {
// complete
}
+ protected Result getStreamResult(OutputStream os, Annotation[] anns, MediaType mt) throws Exception {
+ return new StreamResult(os);
+ }
+
@Override
protected void marshalToOutputStream(Marshaller ms, Object obj, OutputStream os,
Annotation[] anns, MediaType mt)
@@ -356,7 +360,7 @@ public class XSLTJaxbProvider<T> extends JAXBElementProvider<T> {
th = factory.newTransformerHandler(ti.getTemplates());
this.trySettingProperties(th, ti);
}
- Result result = new StreamResult(os);
+ Result result = getStreamResult(os, anns, mt);
if (systemId != null) {
result.setSystemId(systemId);
}
[cxf] 02/04: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d312b280c942bd61428ce6ea9c58b0e01ec54a38
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Oct 16 12:17:00 2018 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index e6dfbeb..45db26f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -20,21 +20,27 @@ B 468cf8f3cfe9ef8285cd2ae66caddf666b7aaf13
B 4b7ede2d6cda7651b686653e0645c40b6684b81f
B 4da42032f95e667a402b113d6daf4bd0514c6d60
B 58e72337226f4e963abfc6f1a65625d86b7003b5
+B 64dd999db1c712cd54f003a76abe1d221a1e3295
B 68af13530379662fc99a716d635d4aab7c5fb027
+B 74ab648ebd678e5d23365507a78f1429540f63fd
B 7c7186c506e662ed0512dc47cdf58caa2ff2eafb
B 91a3122620ecf8ff767f2d769726b6039dbda6d4
B 9db243c1aa44732996514200b490eb63683540b4
+B a0f75306424f54d325ad3e83ccab34aecbd85ab9
B a3295e61bcf8c00c13a79707841a58131fd9c97d
B a41084608cd6677ca665e80f269221105d60deae
B a70c45597c03a0d2365f9273a60fda5182c22457
+B a95593cf274215d32734ab4d328be606568820ae
B a9c0c7705f70054a70eb3e95439d2a37731e0332
B acc697f1c88f392bd952e07d50a9ae2ce0b76411
B ae994168f50894010f1f148ec3b6f35b17e4b63b
B b0094cc8813e56e2ec3694193df07d2d5de0ef66
+B b1b359393c986a2e8471852dd4d6e66fc37c1eac
B b3268466338750b742ee900bbec13e568527be2c
B b8236c923ba409087e8db6132963924151918efc
B b8fc2da105029c10cf24ed344198fbefdd190648
B bb098089d18825ddc850fa82f4acee45e2b6ee7a
+B bbd28b4e7e38ac27d4ea941b703d5a253ceb4e48
B bbe640de94faba94819074234cf4b6a8b637df75
B c9c209c4506c88c13af1f01861eb80c8e9fcb27e
B cd6351b8b7eb9918f0221306bd6fac23ab1fcc88
@@ -45,6 +51,7 @@ B da5b01b32a59867b48e2b35a9281b3625f58d514
B e000e8c0b8ed82533cbeb4e3a39dd9fbf128383c
B e63ce74570117d17552c5cfe9823bc93237583f2
B e9261069513b1947e16bf485182c328c07160e1c
+B e9d4d65a2bdc1e258d5fd1d470abbf68c1ee4d07
B eb76ad6674586bef76a23332030a3dc310cfa235
B f652464526edb0cb7eac277ff64c9f2d02e2b920
B fc656dc1311963f5fc833856984b36b7ccd26042
@@ -63,6 +70,7 @@ M 86d7c657499b73bdbbd6ba9f1579e76ca0715357
M 886a055d49d844e445721e4752c7a6360cbe8b9a
M 9c02f616f6aec1cf43f1d6bac810d606dab98a72
M ac561c4a2b27bd8b427ff1f91d19c7929a8222ab
+M ad5c6ad246f9155fec7096de7701de02d757c0f2
M d419ae389ab4b42bf57106db99758dd8d3b11bca
M e60e8ab5d7414a0dc581c5666873e1ab0413b107
M eaa14b96ea5275ff9ee27cf937cd498ca3dcd47f
[cxf] 03/04: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 8171ae4118ccf8340c25d4d047900059edb20e86
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Oct 16 12:17:45 2018 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 45db26f..74d19ab 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -43,6 +43,7 @@ B bb098089d18825ddc850fa82f4acee45e2b6ee7a
B bbd28b4e7e38ac27d4ea941b703d5a253ceb4e48
B bbe640de94faba94819074234cf4b6a8b637df75
B c9c209c4506c88c13af1f01861eb80c8e9fcb27e
+B cb0585be6862a919249639f7c15c81273e5ef6d7
B cd6351b8b7eb9918f0221306bd6fac23ab1fcc88
B ce6419a07249005c4503bda59289054e6fc42576
B d3de21c45a8f6c74996b5edecfe2e03f8b6a2bd3
[cxf] 01/04: CXF-7869 - Infinite loop in rest client
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d40da6aa1046f6fa519ab1a875f8126df31ff83c
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Oct 16 12:05:04 2018 +0100
CXF-7869 - Infinite loop in rest client
(cherry picked from commit 3fec78a935410d894add5490cd36d15603828509)
---
.../java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
index 61c465a..85cb49f 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
@@ -74,7 +74,8 @@ public class ClientImpl implements Client {
private TLSConfiguration secConfig;
private boolean closed;
private Set<WebClient> baseClients =
- Collections.newSetFromMap(new WeakHashMap<WebClient, Boolean>());
+ Collections.synchronizedSet(Collections.newSetFromMap(new WeakHashMap<WebClient, Boolean>()));
+
public ClientImpl(Configuration config,
TLSConfiguration secConfig) {
configImpl = new ClientConfigurableImpl<Client>(this, config);
@@ -84,8 +85,10 @@ public class ClientImpl implements Client {
@Override
public void close() {
if (!closed) {
- for (WebClient wc : baseClients) {
- wc.close();
+ synchronized (baseClients) {
+ for (WebClient wc : baseClients) {
+ wc.close();
+ }
}
baseClients = null;
closed = true;
@@ -276,7 +279,7 @@ public class ClientImpl implements Client {
providers.add(p);
} else {
final Class<?> providerCls = ClassHelper.getRealClass(pf.getBus(), p);
- providers.add(new FilterProviderInfo<Object>(p.getClass(),
+ providers.add(new FilterProviderInfo<Object>(p.getClass(),
providerCls, p, pf.getBus(), contracts));
}
}
@@ -553,8 +556,8 @@ public class ClientImpl implements Client {
}
}
private static Long getLongValue(Object o) {
- return o instanceof Long ? (Long)o
- : o instanceof String ? Long.valueOf(o.toString())
+ return o instanceof Long ? (Long)o
+ : o instanceof String ? Long.valueOf(o.toString())
: o instanceof Integer ? ((Integer)o).longValue() : null;
}
private static Integer getIntValue(Object o) {