You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/12/15 18:42:06 UTC
[cxf] branch 3.1.x-fixes updated (7cfeefd -> dbd4213)
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a change to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 7cfeefd [CXF-7589] Use just "spring-beans.xml" to avoid lock in to specific version
new 0d3c731 Wrap Integer.getInteger in a doPriv block
new c4966fd [CXF-7585] Close InputStream in AttachmentSerializer when base64 encoding is used
new 99d3338 [CXF-7470] Cannot set target for recovered source sequence
new 1045a49 Update versions of httpcomponents that we use
new 413309a [CXF-7591] Allow getResponseContext().clear() to clear out everything to reduce memory usage
new 864237e Recording .gitmergeinfo Changes
new dbd4213 Fix compile failure
The 7 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 | 55 ++++++++++++++++++++++
.../cxf/attachment/AttachmentSerializer.java | 6 ++-
.../cxf/common/util/SystemPropertyAction.java | 19 ++++++++
.../java/org/apache/cxf/endpoint/ClientImpl.java | 29 +++++++++---
parent/pom.xml | 4 +-
.../cxf/jaxrs/impl/MediaTypeHeaderProvider.java | 5 +-
.../org/apache/cxf/jaxrs/model/URITemplate.java | 5 +-
.../apache/cxf/jaxrs/provider/ProviderCache.java | 3 +-
.../cxf/jaxws/context/WrappedMessageContext.java | 11 +++--
.../java/org/apache/cxf/ws/rm/SourceSequence.java | 4 +-
10 files changed, 121 insertions(+), 20 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <co...@cxf.apache.org>'].
[cxf] 02/07: [CXF-7585] Close InputStream in AttachmentSerializer
when base64 encoding is used
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c4966fd8e9e21034a92127bbd1d7d66a345482c2
Author: Jörn Gebhardt <jo...@ofdka.bwl.de>
AuthorDate: Fri Dec 8 16:22:59 2017 +0100
[CXF-7585] Close InputStream in AttachmentSerializer when base64 encoding is used
(cherry picked from commit e48f90234162cb1b2766d6bc9a245c4d04502335)
---
.../main/java/org/apache/cxf/attachment/AttachmentSerializer.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
index 1599407..66e7b28 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
@@ -278,7 +278,9 @@ public class AttachmentSerializer {
headers, writer);
out.write(writer.getBuffer().toString().getBytes(encoding));
if ("base64".equals(contentTransferEncoding)) {
- encodeBase64(handler.getInputStream(), out, IOUtils.DEFAULT_BUFFER_SIZE);
+ try (InputStream inputStream = handler.getInputStream()) {
+ encodeBase64(inputStream, out, IOUtils.DEFAULT_BUFFER_SIZE);
+ }
} else {
handler.writeTo(out);
}
@@ -308,7 +310,7 @@ public class AttachmentSerializer {
if (n == 0) {
throw new IOException("0 bytes read in violation of InputStream.read(byte[])");
}
- Base64Utility.encodeAndStream(buffer, 0, n, out);
+ Base64Utility.encodeAndStream(buffer, 0, n, output);
total += n;
n = input.read(buffer);
}
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.
[cxf] 03/07: [CXF-7470] Cannot set target for recovered source
sequence
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 99d333873436b9dcf58a5ca4ec837b353f2b1b6b
Author: Gergan Dimitrov <g....@seeburger.com>
AuthorDate: Mon Nov 20 15:48:17 2017 +0200
[CXF-7470] Cannot set target for recovered source sequence
(cherry picked from commit 262b93cc73ea6ce19cb69658f0ca681ec766d4d3)
---
rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SourceSequence.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SourceSequence.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SourceSequence.java
index 4eb5f92..ba760ef 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SourceSequence.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SourceSequence.java
@@ -271,13 +271,13 @@ public class SourceSequence extends AbstractSequence {
*
* @param to
*/
- synchronized void setTarget(EndpointReferenceType to) {
+ public synchronized void setTarget(EndpointReferenceType to) {
if (target == null && !ContextUtils.isGenericAddress(to)) {
target = to;
}
}
- synchronized EndpointReferenceType getTarget() {
+ public synchronized EndpointReferenceType getTarget() {
return target;
}
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.
[cxf] 01/07: Wrap Integer.getInteger in a doPriv block
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0d3c73188b955ac4ec899fb4ed1d588abbfd0157
Author: Andy McCright <j....@gmail.com>
AuthorDate: Wed Nov 29 13:25:16 2017 -0600
Wrap Integer.getInteger in a doPriv block
(cherry picked from commit 9130f84fafca18620888aecfe1d0d8a0cbce1fc2)
# Conflicts:
# rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
# rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
---
.../apache/cxf/common/util/SystemPropertyAction.java | 19 +++++++++++++++++++
.../cxf/jaxrs/impl/MediaTypeHeaderProvider.java | 5 +++--
.../java/org/apache/cxf/jaxrs/model/URITemplate.java | 5 +++--
.../org/apache/cxf/jaxrs/provider/ProviderCache.java | 3 ++-
4 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/common/util/SystemPropertyAction.java b/core/src/main/java/org/apache/cxf/common/util/SystemPropertyAction.java
index c2b6cb0..e3193fe 100644
--- a/core/src/main/java/org/apache/cxf/common/util/SystemPropertyAction.java
+++ b/core/src/main/java/org/apache/cxf/common/util/SystemPropertyAction.java
@@ -78,4 +78,23 @@ public final class SystemPropertyAction implements PrivilegedAction<String> {
return null;
}
}
+
+ /**
+ * Get the integer system property via the AccessController, but if a SecurityException is
+ * raised, just return the default;
+ * @param name - system property name
+ * @param def - the default value if the system property does not exist or cannot be acquired
+ */
+ public static int getInteger(String name, int def) {
+ try {
+ return AccessController.doPrivileged(new PrivilegedAction<Integer>() {
+ @Override
+ public Integer run() {
+ return Integer.getInteger(name, def);
+ } });
+ } catch (SecurityException ex) {
+ LOG.log(Level.FINE, "SecurityException raised getting property " + name, ex);
+ return def;
+ }
+ }
}
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
index 5d297b6..060b8ec 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
@@ -35,6 +35,7 @@ import javax.ws.rs.ext.RuntimeDelegate.HeaderDelegate;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.common.util.SystemPropertyAction;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.phase.PhaseInterceptorChain;
@@ -47,8 +48,8 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
Pattern.compile("(([\\w-]+=\"[^\"]*\")|([\\w-]+=[\\w-/\\+]+))");
private static Map<String, MediaType> map = new ConcurrentHashMap<String, MediaType>();
- private static final int MAX_MT_CACHE_SIZE =
- Integer.getInteger("org.apache.cxf.jaxrs.max_mediatype_cache_size", 200);
+ private static final int MAX_MT_CACHE_SIZE =
+ SystemPropertyAction.getInteger("org.apache.cxf.jaxrs.max_mediatype_cache_size", 200);
public MediaType fromString(String mType) {
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
index 1db14bd..e64e7c3 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
@@ -33,6 +33,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.PathSegment;
+import org.apache.cxf.common.util.SystemPropertyAction;
import org.apache.cxf.jaxrs.utils.HttpUtils;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
@@ -46,8 +47,8 @@ public final class URITemplate {
private static final String SLASH = "/";
private static final String SLASH_QUOTE = "/;";
private static final int MAX_URI_TEMPLATE_CACHE_SIZE =
- Integer.getInteger("org.apache.cxf.jaxrs.max_uri_template_cache_size", 2000);
- private static final Map<String, URITemplate> URI_TEMPLATE_CACHE = new ConcurrentHashMap<String, URITemplate>();
+ SystemPropertyAction.getInteger("org.apache.cxf.jaxrs.max_uri_template_cache_size", 2000);
+ private static final Map<String, URITemplate> URI_TEMPLATE_CACHE = new ConcurrentHashMap<>();
private final String template;
private final List<String> variables = new ArrayList<String>();
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
index bc3c550..ade4f72 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.ext.MessageBodyReader;
import javax.ws.rs.ext.MessageBodyWriter;
+import org.apache.cxf.common.util.SystemPropertyAction;
import org.apache.cxf.jaxrs.model.ProviderInfo;
public class ProviderCache {
@@ -37,7 +38,7 @@ public class ProviderCache {
AccessController.doPrivileged(new PrivilegedAction<Integer>() {
@Override
public Integer run() {
- return Integer.getInteger("org.apache.cxf.jaxrs.max_provider_cache_size", 100);
+ return SystemPropertyAction.getInteger("org.apache.cxf.jaxrs.max_provider_cache_size", 100);
} }).intValue();
private final Map<String, List<ProviderInfo<MessageBodyReader<?>>>>
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.
[cxf] 05/07: [CXF-7591] Allow getResponseContext().clear() to clear
out everything to reduce memory usage
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 413309ad741bceb123c59682b9cbb16c9cac2106
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Fri Dec 15 12:47:02 2017 -0500
[CXF-7591] Allow getResponseContext().clear() to clear out everything to reduce memory usage
(cherry picked from commit 97cde56cd73cb03ffb259f01446080fa7748ab8b)
---
.../java/org/apache/cxf/endpoint/ClientImpl.java | 29 +++++++++++++++++-----
.../cxf/jaxws/context/WrappedMessageContext.java | 11 +++++---
2 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
index 238b801..ccfc94c 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
@@ -242,19 +242,36 @@ public class ClientImpl
public Map<String, Object> getRequestContext() {
if (isThreadLocalRequestContext()) {
- if (!requestContext.containsKey(Thread.currentThread())) {
- Map<String, Object> freshRequestContext = new ConcurrentHashMap<String, Object>(8, 0.75f, 4);
+ final Thread t = Thread.currentThread();
+ if (!requestContext.containsKey(t)) {
+ Map<String, Object> freshRequestContext = new ConcurrentHashMap<String, Object>(8, 0.75f, 4) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void clear() {
+ super.clear();
+ requestContext.remove(t);
+ }
+ };
freshRequestContext.putAll(currentRequestContext);
- requestContext.put(Thread.currentThread(), new EchoContext(freshRequestContext));
+ requestContext.put(t, new EchoContext(freshRequestContext));
}
- latestContextThread = Thread.currentThread();
- return requestContext.get(Thread.currentThread());
+ latestContextThread = t;
+ return requestContext.get(t);
}
return currentRequestContext;
}
public Map<String, Object> getResponseContext() {
if (!responseContext.containsKey(Thread.currentThread())) {
- responseContext.put(Thread.currentThread(), new HashMap<String, Object>());
+ final Thread t = Thread.currentThread();
+ responseContext.put(t, new HashMap<String, Object>() {
+ private static final long serialVersionUID = 1L;
+ @Override
+ public void clear() {
+ super.clear();
+ responseContext.remove(t);
+ }
+ });
}
return responseContext.get(Thread.currentThread());
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
index a5db0e5..85a28e0 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
@@ -181,9 +181,14 @@ public class WrappedMessageContext implements MessageContext {
}
public void clear() {
- //just clear the JAXWS things....
- for (String key : jaxws2cxfMap.keySet()) {
- remove(key);
+ if (message instanceof Message) {
+ //server side, just clear the JAXWS things....
+ //Otherwise lots of CXF things will not be found
+ for (String key : jaxws2cxfMap.keySet()) {
+ remove(key);
+ }
+ } else {
+ message.clear();
}
}
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.
[cxf] 04/07: Update versions of httpcomponents that we use
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1045a4921cd7da4259bf45cdfb817c9a8dcea385
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Mon Dec 11 10:21:18 2017 -0500
Update versions of httpcomponents that we use
(cherry picked from commit 9a8215ce62a8f821f1899792de132d434da09ac8)
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 57927fe..8187d3f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -90,8 +90,8 @@
<cxf.hazelcast.version>1.9.4.8</cxf.hazelcast.version>
<cxf.httpcomponents.asyncclient.version>4.1.3</cxf.httpcomponents.asyncclient.version>
<cxf.httpcomponents.asyncclient.version.range>[4.0,4.2)</cxf.httpcomponents.asyncclient.version.range>
- <cxf.httpcomponents.client.version>4.5.3</cxf.httpcomponents.client.version>
- <cxf.httpcomponents.core.version>4.4.6</cxf.httpcomponents.core.version>
+ <cxf.httpcomponents.client.version>4.5.4</cxf.httpcomponents.client.version>
+ <cxf.httpcomponents.core.version>4.4.8</cxf.httpcomponents.core.version>
<cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range>
<cxf.jackson.version>2.8.10</cxf.jackson.version>
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.
[cxf] 06/07: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 864237edab9589beecb3ff27b272248dad3f3310
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Fri Dec 15 13:03:57 2017 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7af7f0f..dce4e7b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -8,6 +8,7 @@ B 02d826d7ad223c75ad706c7b5443bd06ee6e2589
B 02e822fa5a3c550f7cb963be5abc0b57a78c5571
B 02fd70cd617803bb3beba7f7df3e9b121a344735
B 0336a2399b1980e04372c651368f8718f75a4f14
+B 03a9e8ceacc115ddd1e458d44a198bdd58cf6b53
B 03cacaa47d81f23ae51a976b65832ea50fb68d17
B 03cdee74d8f41079bf0a1e06eecc6a993109fba4
B 042d1dbe5f236125c77db8348bf66d4a3d4d2385
@@ -22,6 +23,7 @@ B 06bfa1334e86ebcf8e19974708d4aa165296edb9
B 0744884e42b18ca70aef096bc124b3a981d491fd
B 077751e99bcb028aae714b909c8e19d4b9dbd470
B 0872b79411cdade10f0a98182fd1839139eb4add
+B 087713493e6987536b80db9e2f8437475c705c1a
B 08e8316aa5c575d6117d20c4054405e1ea0e2887
B 09121b3abf54697f576d4d067190ce696f2f0338
B 09893c1747d823b3456a28fc49468ed91e456f2d
@@ -53,6 +55,7 @@ B 122d1f64f248294a4303632571ec363aea4c2179
B 123d0c372b365584c90daf50996652611a56523b
B 12577809de55186c2521c3519054383caace3794
B 12e0f151dc739ce927548875010a380ce5852ea3
+B 12e767a2e34ba8eabe7a16afbdb221245857b680
B 1304bc2ffbe6b4c3bfdc4e4f47e5e224e52fd808
B 1329e2c2b2f83a7b6e80ad2f15a2602161343749
B 137485de37b3bf81e305e616a5af81741620f547
@@ -60,6 +63,7 @@ B 1387abab66da34304d3773d5b8cccc5e5a81303b
B 13bcc2362509c6d893ed21fff9461d576fda1ccc
B 140ad80be96ea11d360cd7a1d8e791ca91a2220d
B 14d625954edc65b81e4773d8132e9204236b4a3e
+B 1503b428b353697b51c4c98c704651ed8208d62b
B 1552f881183ba35b3706dc3c8061d7c6d85c7238
B 156be3704e27ac69bbbb1905e99f89b88fc7e454
B 15d6a26ab9dc4b2aaf07f9ce23e55bfdd60bc08f
@@ -76,6 +80,7 @@ B 189b6643d30eab4d79a0f7722c9277e76e92a1fd
B 18dd0e1c754fd30c9ab479cf123db5ab8f6810e7
B 1909d85f7d0cbbfd84c8b826f4aabc3963891013
B 1a11cecbedd2aa0384aa340c01620ebce9742061
+B 1a29d4b9e6291d62b73da03b5806ea244d91dfc7
B 1ae4d6dee70587b048c0dcded9cd0b2855c2e225
B 1b2a3d0d2e1a4c8f13368fd7c3e0e1cbfabd2b32
B 1b8064f475b09323c5c11d9e8a4e1440879cae26
@@ -88,6 +93,7 @@ B 1e49510ea71551e543b22f6693307b1436e81db0
B 1eedb232f7f97f5d8cb3a8ab4dcd67251e073ec1
B 1f68d848874bc2be86d3e77e408f0b9879c1e93c
B 1f7241ba6017f1496e9b8aadec5c807ed05e63b4
+B 1f9601c248b4260f2fd5fd27c3d6b0ab868f5a24
B 1fd95a5baa28b009491fd575db8f5d01d11ddfed
B 203b5433bc44aa831bdd9b1dd4ab474d192dea6c
B 20951aeac115e7ae95f4d4cc04da288d2f47e4b2
@@ -107,13 +113,18 @@ B 253900af377eff63e8010d86e2375e4b5c426ed6
B 25cc434516178fe1f686e61eccb4cfc8fba1c72f
B 269e96752b11aeb3e911da76bd3074d768860968
B 26f43025348e101e981e3f64ecc3ddf483ad7fb3
+B 27057bcdfe2e2a90100a75413fc22ed4bc58ebae
+B 2705f4dde2ec6cf3e1102c7c7b4a7063f110fce5
B 27bba67eb336ac27eb1dbf75e6fdcff03320687f
B 27c37bffde998b284f5fa635c49b608cc72e7b43
+B 27e3a631dd57cec3e3742beed1cebd32c8d19ad4
+B 28313139cc48abded32503d83ebad9ae59049455
B 293dbe4f76b14ecb294d58d0cba6fca85b5536c0
B 29a71e159c7979cda231807e322b109cbf1a849f
B 29b273dcc2aae9f67f9a886105245c3652b34594
B 2a6144f5600160e285d6dda35b1355a8995f388a
B 2b5c45ebd897745c83d78a125ea554b0489f6262
+B 2b9c671a1aca1c8514f3c4935ec06145ea6e7cef
B 2d1da35c001514fd37bd74180c1fdaa11e2e7b00
B 2e06ad9a423af0b51905ab87184097a7c7c936bd
B 2e6e9debe0449fdffaa33142185ed712ebec6a22
@@ -135,6 +146,7 @@ B 344feb53305bdf28a807c9fc2d515bda70e5f640
B 3450d3854e97dbd67eeaa862d09d39cce9846de9
B 35639ab59aabf4cace331f49505b699f164df0b1
B 35ab874f8a1b2ad4fe045e48465c9bdeb46f685f
+B 35e567b2cedbc87bef1cc4974cfff606a16ce01c
B 35eaececdf71dc6a2581c0ada943350e9da35e58
B 35f9fbdac1c8541915a7ace515d17d898758c251
B 36ca8b05d55779971e4ecb681122ed610f9d5bf9
@@ -145,6 +157,7 @@ B 39851b83af116611ce0efe70c4b9a32ee8491523
B 39a5690d7d50d8481739c290f49128be4d55f8ad
B 39bd1fe48b1771d092914048a7a1b9e2686a14e5
B 39e6c2a44a53062ca293cf4760a0ef54aef95090
+B 3a22d3e31b1e62d3256c4b1aefe7e24e8a429487
B 3a46e586b405c79a98e37d33a30b2fa22905f853
B 3b08b6301343406f5f312fd4d0f385a6227775a2
B 3b2f2ed2db01f05fa9b648693ce33978ccc8ede8
@@ -156,6 +169,7 @@ B 3c171d7a4cd1e2c77e0a0081ddf54e6549d3383f
B 3c1e2e7245aa89b9ac097e210ff70cdfa6c301a4
B 3ce7f00461d9c868301003b5c16138c491a9ac0b
B 3e50ff46becd978ab228b8d8a0ebff5e51b2274f
+B 3ebafed47e8ddb65f19860fc9a5991562c85e949
B 3f259221fa1dd9227397400ed9653374cb4fdc39
B 3fa435a2908d95b656933d0d34f9ccf8c0153ffe
B 3fb52c3e62aedf17b99034137033ec95c4a598a0
@@ -210,6 +224,7 @@ B 51dd24fd417a4de6ede3282f7cac05c795eca1e4
B 52bbb4bfdbae96c93693191c850db12e6f5f21e8
B 52ccbfa5e9fe59662eb8e534c79d4cd48a370703
B 53a46205871434d8c47ed45822e078e5ad6d2c60
+B 53f738a2cacf205b0221f03bd9579e9891708c69
B 540a1255be34c047c094f53461925d46c3ed058b
B 54910695917fb63a11982a8dc96a3b4d088963c5
B 54b71171e89bb1be7d169ac91bb626c9c1ca293b
@@ -217,13 +232,16 @@ B 54e7c58d5449d5f91879674598fe1b1ee339a272
B 550df751b7d7dcdda1a92a22d80890c573be9998
B 553329cd35e14013fbf727b392cf40374f399ba3
B 55504e75246c4425bece6c2a05e5c22e125900a8
+B 564d36e1e89b401b48ffab6579ae1bcacc04b4f5
B 56dab42caaf27e3bedf08cbb419d3644aeccb7af
B 56e26f63995e992c14fb20451e9ccf9bbbcb38a7
B 573405dd523139bb935339b89c28f849676da727
B 57506614303663917781493546f37abc978ed663
B 57cb5447341949836b7d8cc8f00ca3ced68622f1
+B 57d701068217ce30a47f73a08fe6359d186cd012
B 584df3ae111595da1b44ccd9db9567c2172bbb2e
B 58b379bdf8cce2434f6033e2d7adab944afff05b
+B 58ead76f43a8b5a54e477d1271b103d0541aa989
B 5914df9550b9ed2d84afb5b6d2f36ad71ec8f675
B 59436eadca147ba937a24a4f4fc6ced93cc0bc7f
B 59b8615053ddcad353fbebcd9a5b1109ae0897a1
@@ -231,6 +249,8 @@ B 59b972618b40c5dbaca2772673ded17c5273e7d2
B 5a259a2d6c47454352caab2d18d7a127d22d6dc9
B 5a57f4a89737a5cfa37ffb94f6643c08e2ab6eb1
B 5b4275ce202777828633dbb65133d3fe44f1d404
+B 5b90271e05b62fb8b576d3a48bd224abd4871af0
+B 5cadb1e99fec627a45dba61f8ded76ad71a569d2
B 5ce0b6eb1488d8ac575ee055d5f8cf83863546bf
B 5d73e20b4539bfa4c8ca607b27a1c1ea1850e095
B 5e068d215b750e3211aaaf3d0b7b366d6a220fc2
@@ -239,6 +259,7 @@ B 5ea90a91d9148aa59aeb9b7e6611b58fb8da1fe4
B 5ecbf03367cf5fe5f3ec3c08d6213845d26fa4d2
B 5f277de68568c7e3df68c2f5f40a09faf353192f
B 5f32866fc4bcd03d7cf4f6e2f9339d4c07624868
+B 5f35c090e1a66c9ccbbd096d8c6423a35696b5eb
B 5f71733592e1b590fa53c98d86f8ccec2a7b2bcd
B 5fa39c84511e3a329e9e84be2f7cf333b122f375
B 604167d9f0cfc67e01219a19a95353176ce38f79
@@ -257,6 +278,7 @@ B 65e1e07fdb810ec9de135530ca3e3d23821836a3
B 66447a377f0b2cafc2f337456b5fd41f832556e0
B 671b1cfce0c423a1e9e8392fdd1750697fa968df
B 6755b06ca3eede0132d17633783800f3e3f07484
+B 68277408db8c8d59abdac08d4297562aa01fe0c1
B 6846b4093fa73ebec34031210ee8ff16435ea406
B 68f110e5bcfe26d050bd05988ecd9c863e6e8742
B 6918eba1a3229cece97dd90127804b094d82a345
@@ -306,6 +328,7 @@ B 7a5e2690c36914ba481570c811f23d6e6b80bc07
B 7b7629682d15345518e66d46e575bf1ac334cf00
B 7b8184c9772834053d33cb39d809652a339225f6
B 7c191d4d590a5ef621a0dd5adfff59512c91daf3
+B 7d207e00ed3001132e9013997f876d949d4718e4
B 7d344ae7ed882a4347d0f8775744646e0013aca5
B 7dbce543a96c6ec1c6f02ab0530146c3507fa205
B 7e2b6f21b7c9d3e922bf93c31af3c5be896509bb
@@ -317,6 +340,8 @@ B 7fab6245608119634271e580166120b9c55dce48
B 7facb09bd371501dbde438fcef82dfb4a0d98f6f
B 7fc957efa3a193a5f2ae178b8a608717ce4c5b26
B 7fcd84b1f82a203917a5269a2c0c10a0d5b6f877
+B 80783b9a0098831e9386a1f48514ecfb7ec30e5c
+B 8089b066d87224c43e953170bb3669b9c869f934
B 811daf375e496e42ac9002aaf59f1eb2c1301942
B 813c06f6946c8e065c57af224741b2f245c6aafe
B 8172db9fcfd3472731fdd9e26704bcdd7f63cd76
@@ -330,6 +355,7 @@ B 85e9a478055cb35f917e5cfa8e19fa52a7290fe0
B 861a4ee420951d42d2d2b43e63d956c98c13fddb
B 86251ae75e6a663d6419623f47e393dd7a042742
B 864dafbc5732fa51a79b45c0a3f3bf3dd378611b
+B 87e99cf69f9bbe7dc33ddc69c8842e041bcb0b6f
B 885b65d32198083961e380c8c55c7d7a6d00ed33
B 88bc4167e5a43211458d7c9b83cfd43ab83876ad
B 89a588e9b4ab33d5e095ae889c4dbb2db7478195
@@ -346,6 +372,7 @@ B 8e7d8e18e820dcaef748c2cab6091f884fe647a4
B 8ef43effed51b0339693a671f16c5d9a96e15bd7
B 8f1d4751b3ed127584b4112b3bcd6d6096b4b012
B 8f98be8e72d4dbe18347a7efab91f4b008d8385f
+B 8ffecb49afec7d2d29838be1e999533e32dfb0e4
B 903ef61fef424a6edfe2727a455139de6be45dd8
B 9063184ba1280e6d2492ec47d6ebfbb7a19c25ab
B 90a74fc75af41898ee50359c13f298eb483a3d01
@@ -391,6 +418,7 @@ B a4167fb84baa1834bbe86be8a749c385f1af8c82
B a4b794b55b1ea258e9168a58f05794f37aeeb049
B a4b98454d147437ff71b92355d60e8bd48d56448
B a55635031f4e86124269df880bd3182b1b2dd78d
+B a55fe18d50a951959406ea63e153e68652c0d360
B a5dd7fa02b73852f250c8d87b10c7fc1a6e1f4a6
B a61e8216be68a414a80ec42377b906349d571f8d
B a7126b66417fd51cbe42f850a5cf8abd6b7e9e02
@@ -401,6 +429,7 @@ B a98345918f30b8288621ff7b3e7dc09947e86527
B a998152a243dabee50aa49f28d76037666adecd9
B a9be83670c14bca8e9739e55955dabd0e313796d
B aa5cb3f487fce03a0c069ae4bd33fae82be1e8b3
+B aa7cbcdbe33f36ea398835350088994071172ade
B aaa00d17fa3b1056c98f0002a1e27d23fe9685fc
B aaa4010efe517954f67280062ec76bff27899694
B aad3a62bf74f3378c4309a611d8b9e498bce14b3
@@ -420,6 +449,7 @@ B b02720dd7e7d81cd2f0c9ba9c8d424b038c34c7a
B b0399bf5230754ea7edb97efc11804c255bf2d15
B b084da3755a55a805c330292de0ffdb3c1eccad8
B b09959c9aa05b77e40523da8574a5aa2947897cd
+B b0b503dc8b794dbdf8fb52656dc497689bbe9d0b
B b2c10cc6c18a6e6589d258436303c46b3f682f7e
B b2ef3a6dde589de1021fce712f3c32764009c887
B b3c49a34cd86a1966f79aed10c2df54adbdf7c5b
@@ -442,6 +472,7 @@ B baf0980cfaed32f5b69d87c0c727cde7fadd4159
B bb5f3b264c4d16b5545360b9c8a84138676a7c0a
B bbb04acb7c09d28ae8f662f1cbedd8c5f4d1bf1a
B bbda68b6d7948d098ee598d248266f4ce81c820a
+B bbf85d9bcf72c4c6e099751b9baf8f1abc6a2938
B bc4cd1ed8ea06ca7e0a05c5d2ee898bb937b3663
B bcacbef8c3aa0e40e2cf560c6d0922edb4b641fb
B bcb6385a095dcaaf8390ecfc33e9e22b9149daad
@@ -458,6 +489,7 @@ B befeb0484cb195cbcd6163f65c54a94ba26d8335
B bfa7a22c95af1f7c33f218d0cf5b10f17fce308c
B bff51a63aa05df40f92c80bb940fb43af78653f2
B c0e79369faa3acbca703f9ae93d63da1bd216e5c
+B c18bcfaf1e114ddebde79c10aca731a845207bc9
B c194254d62b2d89a58fbd77c287b4bb106caa61d
B c1ba5d90e34993d737f0944dbb69ccda7c4bcfd1
B c1e2c973fc42ba7027fdd0ff1964bcbf8e61dbd6
@@ -468,6 +500,7 @@ B c282dcee8373b9564c747fc8fac4e4e9a3b3afc6
B c2ccecb23ba23497c95be89f9b37f38c69faba7a
B c2daeb5b45b758e9f54ce73dc4567a69c47d9170
B c3a1392d1656c41a9bbdb24698eb27fbc757628b
+B c3f49bf4f2d23aca0cedc508c4cc796eb128b7de
B c49f7a0be25d3f99a8fe81be6209139c3c0df562
B c4e4b45dc3d662d252ed5a29a5f5f06c6c13bbae
B c4e9c63ba0a6b854c0b31b6f7bfdaacc32ba3264
@@ -489,9 +522,11 @@ B c92875b6da5934aded09170a30a46d4015cbfa29
B c978ca0274c06abd6ebf67adf2a839c4624b4906
B c9da051de80efd513e2a3e20c0b5c6ff942291a1
B ca2f8e81168b5b4ca72fa6c3c4529109c7d7c5d0
+B caf52cf13bb169ee555528738f52faab66254d64
B cb405d4275a5cf30187c4fbf957dbbb70a9eeacf
B cb607e91281aaf822bb6a92fc34077435921a664
B cbf0fc5d1b2e80f92129078b0d1482f9e67fecb5
+B cc07d8f8b17e4933ec695a054f56b25cd67f4bfd
B ce274c7b4450279f2c0d4deae5bc5c3952af5c42
B ce2dfb8f84175df5fb1c2241b80b6342ca4eeb55
B ce6cdcff2bee46194baa3e3b63b93616fcaea9c8
@@ -514,11 +549,13 @@ B d3d65670d697fc2a32d72ea305fdc49e693a8fc0
B d48820be51bee9a9511adac314bc456bb726e6a1
B d49f3f2468cde9aa1f34d6448c6e35e717ded676
B d529ecd2252046c0e55fbe7b5e6a24c7b0d07301
+B d53a7a3579d07d24be2e8df9982efb5609e1452d
B d62b480a16b9361d63a99a620b0006a425ebc73f
B d641562a30b76af9e90ef0c767e2e81e93a4fad7
B d770183ad67370694e140a4aac9dae6b0753dbf2
B d7d30736aae953b2f7a4415f1ea575bfc6e43ae2
B d8a0a04d9b8b5206c2e24e976a94f328c73a49bf
+B da2970f221bacac5cc64997f0cad7bc1b319b7d3
B da321593b597711af7307a0fc2c11de070653356
B db11547c955d42be5dfa74463fa3d313123e6ffb
B dbaf44f3ed9c72d31f5083a4a6e3f92af48d7b26
@@ -530,6 +567,8 @@ B dd723f846949d66e24ab103c2efde426ea9fb141
B dd81c1eb76d853f735b2265a18653ab862298468
B de61a48bf953950e16d67038247903b747c4e7ae
B de675431040a434c2bd1ef66667472fb4a49a9ab
+B df41960292388518c42c4440d80d962c509dda6c
+B df4214a976fe8b88ba8976b59ca5a82cb7ae5d76
B dfc84b0fac84e001069800b32f01529d50339cdb
B dffa0df6ce47291364baecbfe78cb131d20be6b7
B e14d803ff84be7c59dd7c2321f1090231967d45c
@@ -547,6 +586,7 @@ B e47f445bacdca72c86b0aa26c152841f0a37f36e
B e5b9f0e1695e73c33a40248d45fa4eba034d39b3
B e61a83d4ac18fc760fc5d4bc8fb19d6072aaac52
B e636c50b0d5f9bd811896bd21e20f58d7942b96e
+B e6586d42d02b5457f4d077b0889d57dd5f8ec6be
B e6695098373dc39037384bae2544e7b5051d9f2e
B e6d84cf9f3ac669003402d122178a55e8b7e4493
B e6f0722615190861192972a51b3986b34efd1f0e
@@ -563,6 +603,7 @@ B e9e1fbe33658421590ec149b0f82c12d2fed2c53
B ea253cc931affb8cddd3727449142e11ddd536ed
B ea458d27bdbd30b0b3ef785d18e45ddf2a75b74a
B ea8b6e270c3a4a62061c4269174b6326a57ea2b5
+B eae819ef21a53954f2112ea6f27e2e6964a7a7b2
B eb55972ac7eb588d17b2f0380913d80ece3fd6b3
B ebce4a65b15a1a99f18c1ea0111affafc447ce7e
B ebd1c24df1b405bf0478f191ba055d96e8ccea41
@@ -605,6 +646,7 @@ B f6ab9808289930238e3d5bd161239551b2ead00b
B f6ce97d4d38446c8336f6f713d0306d52edf6086
B f6f5979a94325e88d45f4313a853ec4c8b585be9
B f84cad4f52af9df97ab40605d0c3a1a54c8ce083
+B f8af79f310557a9c2185895d2edc007813b990ee
B f903ba51c55a5c62ccbf9d9a4f88491efc43bc9d
B f94e1dd9b2a8d27ec5a27bfb7c026e3ae2350e39
B f98785bd8490c4717353f1a9688cae3e7a823ec2
@@ -613,7 +655,9 @@ B fb11380da6e5c157ffd311c2925eb533d134c8cb
B fb30f8bffc85fcc3208fcc0e1eda4b54a89b5d37
B fc1c4e34d8544b207e423f5e613e88af70d91a39
B fd53ffeb92b94605dd47e0b28949106f1cf480a1
+B fd55efab2eacf7e63bb367b438f49993eba62bc7
B fd77d3f3380f805db3547d37cbb2ff72bd033ad0
+B fdef57c5be4cb549797e444384789ddea1606567
B fe3fd44a80d12efd7a4bc6f965451e63d63ee84c
B feba8045486cd910b238065cbb3ee4a741198d76
B fec567254767d611246e6d43c44a5f80cc3390a8
@@ -647,6 +691,7 @@ M 09fb22b25333c66514f06652ceaf7fc11bde51cc
M 0b41912ef154373c900e1932a86d827a8f5e6963
M 0b7b18333591d6bb8e0bfcf324bbdefaa8cce21d
M 0c307b67340dcafd75a1fd40ce003869ddd4594b
+M 0cfd4e0eb5d2e0ce46e4337191df4a31566a7a0c
M 0db60be561bf758e3dca25d6399125c544caf458
M 0e5fd5a54cb271ba494e7e30b45d4228b33364a9
M 0eef86f37288f71fd96506fb2ac7fa27169d1e43
@@ -684,6 +729,7 @@ M 1f9cbe3678c1984fd2fd57e26fdd5626841c32e9
M 20d0a2811c15cb65a402eb063e1359236d7014ea
M 21031e3ab2ae227540e2a078d0336d894361acba
M 21618dad08506cc80edde02cf1661cecd06c49ab
+M 21645b13d26fe235befa5c0b8a2c431a8bde34b1
M 2519863ca4d11ca1b6f3ac74361f3eaba3918690
M 2538ae42fb0c774023deed5264291b2fe6658cb8
M 262ebe6bd5a46a7f5c27976b02e2e4ba25e589f8
@@ -733,6 +779,7 @@ M 42efe37cda66bf3d4b11495452261ff3f624c8b1
M 437c7daa3345c8482deab4a4da9b164e68fd417a
M 43e19de6c7409070aa4c7c52158ec33f5a4651b9
M 45d54d558625236b84752b0d7976f0cf85518c16
+M 4617ee993cfa7a274d54fe0ad590fa13409e591a
M 468edbdcb420128c29d16ee143ab073a475852b8
M 4719a033d54fd9fcd173be273e6c320d8353b631
M 47691ae5c2c6528d95795a51e98e02b54a033c88
@@ -796,6 +843,7 @@ M 6fec911ee7848bd35c3ad5aaa5ff7607ba30e624
M 70a6f989e7062121a73ccdbc686dea4025d41f55
M 71fd0ac3f059ea34c37da9513bb8a2be8641b891
M 7228709bff3fe66626830b0018547d001588da00
+M 72331b452f83e78229f402beb33479cc69c0a761
M 726c0aa641e408a18fa5f4ff82df682d489874f4
M 7304dfbd8f3044d8d46981abf2058c6cb732d219
M 746914a5084f5db8d0c0f052802c7ef2217b9b6b
@@ -809,6 +857,7 @@ M 796eff3ccdb50687873f24b67659526bb13605d7
M 79939ff189c0872317594690be2d85ae05958fa8
M 7aa8ebf5450c0a399e86fe5d50865fcd22849f63
M 7ace8c84cff4696e365800fbba12cc789e97971f
+M 7c2fef57b7d59448308e2cebe5b77a2f561b5bd7
M 7c3a8b02a62db3bcc5c3a1895e9f30bc4fa3821a
M 7dbb31aed4bfa28bd170d6170d76ba4d7f43e7de
M 7e952df66b6ede5c8084aa3387f82224ef04e1ea
@@ -850,6 +899,7 @@ M 8fbf0941ca52aac406b3efcf2e0d73436c72d0f1
M 8fc9d782901adddf874fe7c2f9500836a0585707
M 905f619067931ff340536e75f0c3d196d5fd334f
M 910f37767518832cce843c2a093ee833b7c48916
+M 9130f84fafca18620888aecfe1d0d8a0cbce1fc2
M 91bb2a18f4653f997e455c5089e7a009310591c6
M 9235cc51eccf1048dc80358dca6b9ea6dcd00ce9
M 925697fb861b5dd0be32fa04f72a60665bd2c0b0
@@ -861,9 +911,11 @@ M 955fd4b7fee79642934a828b7758ce14f783364a
M 959a067ef27ff94b38aea5670418998a1add9999
M 974c9d346ca9229d60a4d176b892f5920b994668
M 97b20f61bbf7054076c8cdf609beb8a7047105b8
+M 97d813c04981a03ce878720c7dd94b17abdfbd0d
M 982556218c86ad834a6bf76e62e0a77d055e291d
M 998ce1e5df26773dc96d130b9b55c7d6eec746e7
M 99f6eb63fa7da2a29ea9d28f1c55c5cb90a09222
+M 9a8215ce62a8f821f1899792de132d434da09ac8
M 9a9e0a8a37608195c4ef6fbf386728d13d025d2d
M 9b2bda583c09861c693122ab631c4bffa2187ddd
M 9b6666816a21d8b85cc051be59a8ab6e968c5d0d
@@ -871,8 +923,10 @@ M 9c6f0b8ef0a00887d11706771c88b0a28c818b9a
M 9cb53caf887415c1c025de9e62aa3831b9a6ff8e
M 9cb5b21db2b3912ae84cb2cf6e0e040a821745d8
M 9cd3116cbdbbfb139f40ad2d9e49cec1adf08a08
+M 9cda84922a1dde540e6a106e2e1ac5c8f51e4c16
M 9d3c46e0cfe87700d7105ee131c3e3e33f228e06
M 9d64bcedb508732cdc377312f0fb433ee1dc630e
+M 9e0f7ea38b6afe8f4180082d3a82d9f969a05df3
M 9ecea375930d1a217f35da65e0d6073f7a80bf7d
M 9ef150dd971b8f8752e3fd3c7eec2fe5de41f160
M a034e5853484a7ef0a9f0ad1ae6582178f622f31
@@ -983,6 +1037,7 @@ M ee248ce7a4a1b04bcbddbdcef82d695ccc140160
M ee62e3c371cd7d41796cba09f110f5cff12f5060
M eeae04330ebd610be9cb46891e9f05851afad2a4
M eec5aaf5a7974dffef5c25ddcbd1d0b3721660d0
+M ef562f6c17a417081651d55364c4dc17191aa741
M ef8dda985d1fbe31812b932650026658032d3ec4
M f133df0f691191fac9566726db06c9b4dc7b65a6
M f3304a89a7e93e9c466ee5dbd8d97ffe2d50f50f
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.
[cxf] 07/07: Fix compile failure
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit dbd42137cfd7468f480393438ce47e9a5ec5c265
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Fri Dec 15 13:05:58 2017 -0500
Fix compile failure
---
core/src/main/java/org/apache/cxf/common/util/SystemPropertyAction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/src/main/java/org/apache/cxf/common/util/SystemPropertyAction.java b/core/src/main/java/org/apache/cxf/common/util/SystemPropertyAction.java
index e3193fe..8c74427 100644
--- a/core/src/main/java/org/apache/cxf/common/util/SystemPropertyAction.java
+++ b/core/src/main/java/org/apache/cxf/common/util/SystemPropertyAction.java
@@ -85,7 +85,7 @@ public final class SystemPropertyAction implements PrivilegedAction<String> {
* @param name - system property name
* @param def - the default value if the system property does not exist or cannot be acquired
*/
- public static int getInteger(String name, int def) {
+ public static int getInteger(final String name, final int def) {
try {
return AccessController.doPrivileged(new PrivilegedAction<Integer>() {
@Override
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.