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 2018/02/26 18:01:22 UTC
[cxf] branch 3.1.x-fixes updated (81419b8 -> 022e368)
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 81419b8 try to fix build on Jenkins using maven-toolchains-plugin
new d5de3cc [CXF-7471] Use createResendCandidate() instead of constructor directly
new db1d69e [CXF-7508] CloseSequenceResponse does not have acknowledgments
new 2ac7cf8 [CXF-7522] Only do the exponential backoff if that is the algorithm selected (the default)
new 906f761 For wsrm 1.2, make sure the TerminateSequenceResponseType is returned
new 409d1b0 [CXF-7508] TerminateSequenceResponse does not have acknowledgments
new 022e368 Recording .gitmergeinfo Changes
The 6 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 ++++++++++
.../src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java | 11 ++++++++---
rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java | 10 +++-------
.../java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java | 6 +++++-
.../org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java | 4 ++--
5 files changed, 28 insertions(+), 13 deletions(-)
--
To stop receiving notification emails like this one, please contact
dkulp@apache.org.
[cxf] 03/06: [CXF-7522] Only do the exponential backoff if that is
the algorithm selected (the default)
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 2ac7cf87f4ebe87fd2390a02c2a64e347149639a
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Mon Feb 26 12:12:56 2018 -0500
[CXF-7522] Only do the exponential backoff if that is the algorithm selected (the default)
(cherry picked from commit 7d8fe7b4a95748d8cad3c3ce2089cd6efa902e61)
---
.../main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java
index e2ff271..c5d8ca2 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java
@@ -418,7 +418,11 @@ public class RedeliveryQueueImpl implements RedeliveryQueue {
if (null != rmrp && rmrp.getInterval() > 0L) {
baseRedeliveryInterval = rmrp.getInterval();
}
- backoff = RedeliveryQueue.DEFAULT_EXPONENTIAL_BACKOFF;
+ if (rmrp == null || "ExponentialBackoff".equals(rmrp.getAlgorithm())) {
+ backoff = RedeliveryQueue.DEFAULT_EXPONENTIAL_BACKOFF;
+ } else {
+ backoff = 1;
+ }
next = new Date(System.currentTimeMillis() + baseRedeliveryInterval);
nextInterval = baseRedeliveryInterval * backoff;
maxRetries = null != rmrp ? rmrp.getMaxRetries() : 0;
--
To stop receiving notification emails like this one, please contact
dkulp@apache.org.
[cxf] 06/06: 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 022e3687c20fa0b550acb08bfb56050f2f267b08
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Mon Feb 26 13:01:15 2018 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index c0aaed6..1817454 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -84,6 +84,7 @@ B 1a11cecbedd2aa0384aa340c01620ebce9742061
B 1a29d4b9e6291d62b73da03b5806ea244d91dfc7
B 1ae4d6dee70587b048c0dcded9cd0b2855c2e225
B 1b2a3d0d2e1a4c8f13368fd7c3e0e1cbfabd2b32
+B 1b61831baa6c866a04ce7cd95b46f3041ec4f83e
B 1b8064f475b09323c5c11d9e8a4e1440879cae26
B 1c3085ea94a902e6bf4a49b50c121e778efd28c2
B 1cf17867a2e8a30ad061a038895e0b801331d028
@@ -127,6 +128,7 @@ B 29b273dcc2aae9f67f9a886105245c3652b34594
B 2a6144f5600160e285d6dda35b1355a8995f388a
B 2b5c45ebd897745c83d78a125ea554b0489f6262
B 2b9c671a1aca1c8514f3c4935ec06145ea6e7cef
+B 2cbcb539494120034bd7184601465f41d4230747
B 2d1da35c001514fd37bd74180c1fdaa11e2e7b00
B 2e06ad9a423af0b51905ab87184097a7c7c936bd
B 2e6e9debe0449fdffaa33142185ed712ebec6a22
@@ -213,6 +215,7 @@ B 4b96a222aea61f9fe80083c4c4bb1519955890ab
B 4bb53de95594c3438ed76dd67728c9d485f8d3c3
B 4bf780105271e91451446a2d96032249486b32de
B 4bfd87f8d3d07161606428463934cc4a95ea5ce9
+B 4c46bc4cf62d0881b372e9d58bf21981ce4b8fe1
B 4cef686cbbfcc8ec99042b525b44e5cc12647e1d
B 4d676a78a8aa38ee3f010e9a991adde281833155
B 4dd4e1cf0d517021fd65ffe219a9be6c9f75c84a
@@ -240,6 +243,7 @@ B 56dab42caaf27e3bedf08cbb419d3644aeccb7af
B 56e26f63995e992c14fb20451e9ccf9bbbcb38a7
B 573405dd523139bb935339b89c28f849676da727
B 57506614303663917781493546f37abc978ed663
+B 5786df8619807edefc1b463c1820a70efd868cbd
B 57cb5447341949836b7d8cc8f00ca3ced68622f1
B 57d701068217ce30a47f73a08fe6359d186cd012
B 584df3ae111595da1b44ccd9db9567c2172bbb2e
@@ -308,6 +312,7 @@ B 702389744199001e6c35e602ffb197ebaaf84838
B 706eacc5ae12e1c95085d2f8602c632c921e849e
B 707fa4f3c3f3aa40979e57468a9ac3eb3102a71f
B 70ac8edcc95d88ae4a338005ffd07fe149b46793
+B 7230763f340664c3c235e9acb123acc058062b30
B 7263bb6f9e9025c31cd5bcab1f270805587a6a6d
B 73d1f886ae5265131e8664ee952ffd1cdc82f71a
B 741c9e349e7e48d3fe278ba8d8f17dd6bf4c4370
@@ -370,6 +375,7 @@ B 8b86ab84acd8e5d11b9a2f3a960f1c40ba7d4bdb
B 8b92fe57dd9a661dab382da7d556b1972f513a93
B 8c79c231b9e06901fbee317a5faec5b6807e5256
B 8cea7c879658e83d7a4f54f6d4e8dfa0e449c67d
+B 8d1ac984896439b10947add38070650e1947ecff
B 8d7bd0e8c16154a184358b9c18e0f8c8e1ae7dbb
B 8e769d46b1a1bcc27da0740f23020a2776aff6e5
B 8e7d8e18e820dcaef748c2cab6091f884fe647a4
@@ -454,6 +460,7 @@ B b0399bf5230754ea7edb97efc11804c255bf2d15
B b084da3755a55a805c330292de0ffdb3c1eccad8
B b09959c9aa05b77e40523da8574a5aa2947897cd
B b0b503dc8b794dbdf8fb52656dc497689bbe9d0b
+B b29aff3e9e634db038cb6c7f3d3a8cf5d0fb159c
B b2c10cc6c18a6e6589d258436303c46b3f682f7e
B b2ef3a6dde589de1021fce712f3c32764009c887
B b3c49a34cd86a1966f79aed10c2df54adbdf7c5b
@@ -717,6 +724,7 @@ M 1236b09b624194304071063670580f14e49b6cc3
M 1260b93230f14d83716412d9572b9e83712e10f8
M 127acfcf24207eef314efe9ffd72e5a032e02ee1
M 12df8ab265109473b406bba414efcd07bf94ebd6
+M 134b173f26ccf58d60fe1bcaac9d253a1449feb9
M 13d33c9ed261e06e44706cffa1671d67d31096a7
M 146b00d1947058705c873dffe2ba78ad35c8b03c
M 156b166b093aa92c1fc400e0f1f7440ded701169
@@ -959,6 +967,7 @@ M 9d64bcedb508732cdc377312f0fb433ee1dc630e
M 9e0f7ea38b6afe8f4180082d3a82d9f969a05df3
M 9ecea375930d1a217f35da65e0d6073f7a80bf7d
M 9ef150dd971b8f8752e3fd3c7eec2fe5de41f160
+M 9fd0678b244dd9f9996af6255d6ad882abbce30b
M a034e5853484a7ef0a9f0ad1ae6582178f622f31
M a1710bdd783afcd667d9e72ccb031480d3806850
M a2cbe758286d00b5c5d9c5fbe6be4cc9d7ecf225
@@ -1006,6 +1015,7 @@ M bad68afd7ffc078b010e98dba84ec49b18258ae3
M bba922fb4dca56ea4f9ba641d9456e43dbfeca47
M be2bf8d644887fc1853210b9b82db897c4d73dd0
M be99c53015cb37a692d2e4dbe3682c7407f29b99
+M bfd27cfed696520ccdfef5183f5a4f887884290a
M c01c68ddda10ec6db492b86d818498bec0bf4228
M c212240f696e3387df19bbcf22d1851aff320078
M c255034b2d6eb99bb2753b3d6932af06fd6cbe16
--
To stop receiving notification emails like this one, please contact
dkulp@apache.org.
[cxf] 04/06: For wsrm 1.2,
make sure the TerminateSequenceResponseType is returned
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 906f7618c90e484b7532778ac73dc5f2067328c8
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Mon Feb 26 12:13:37 2018 -0500
For wsrm 1.2, make sure the TerminateSequenceResponseType is returned
(cherry picked from commit 9fd0678b244dd9f9996af6255d6ad882abbce30b)
# Conflicts:
# rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java
---
rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java
index 80a64bc..151ab0a 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java
@@ -239,14 +239,10 @@ public class Servant implements Invoker {
Destination destination = reliableEndpoint.getDestination();
Identifier sid = terminate.getIdentifier();
DestinationSequence terminatedSeq = destination.getSequence(sid);
- if (null == terminatedSeq) {
- // TODO
- LOG.severe("No such sequence.");
- return null;
- }
+ if (null != terminatedSeq) {
+ destination.terminateSequence(terminatedSeq);
+ }
- destination.terminateSequence(terminatedSeq);
-
// the following may be necessary if the last message for this sequence was a oneway
// request and hence there was no response to which a last message could have been added
--
To stop receiving notification emails like this one, please contact
dkulp@apache.org.
[cxf] 01/06: [CXF-7471] Use createResendCandidate() instead of
constructor directly
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 d5de3cc18cefead621dd2310ed2851877ccee1bb
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Mon Feb 26 12:11:45 2018 -0500
[CXF-7471] Use createResendCandidate() instead of constructor directly
(cherry picked from commit bfd27cfed696520ccdfef5183f5a4f887884290a)
---
.../main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
index 8b801ac..1c912bf 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
@@ -323,7 +323,7 @@ public class RetransmissionQueueImpl implements RetransmissionQueue {
* @param message the message context
* @return a ResendCandidate
*/
- protected ResendCandidate createResendCandidate(SoapMessage message) {
+ protected ResendCandidate createResendCandidate(Message message) {
return new ResendCandidate(message);
}
@@ -347,7 +347,7 @@ public class RetransmissionQueueImpl implements RetransmissionQueue {
sequenceCandidates = new ArrayList<ResendCandidate>();
candidates.put(key, sequenceCandidates);
}
- candidate = new ResendCandidate(message);
+ candidate = createResendCandidate(message);
if (isSequenceSuspended(key)) {
candidate.suspend();
}
--
To stop receiving notification emails like this one, please contact
dkulp@apache.org.
[cxf] 02/06: [CXF-7508] CloseSequenceResponse does not have
acknowledgments
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 db1d69ea84f35477046975ea896118b67590ffb5
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Mon Feb 26 12:12:15 2018 -0500
[CXF-7508] CloseSequenceResponse does not have acknowledgments
(cherry picked from commit 54054737231ad3b0308720a3752ba2caaacbced6)
---
rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
index 58b8194..0807f3d 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
@@ -110,7 +110,8 @@ public class RMOutInterceptor extends AbstractRMInterceptor<Message> {
// add Acknowledgements (to application messages or explicitly created Acknowledgement messages only)
boolean isAck = constants.getSequenceAckAction().equals(action);
- if (isApplicationMessage || isAck) {
+ boolean isClose = constants.getCloseSequenceAction().equals(action);
+ if (isApplicationMessage || isAck || isClose) {
AttributedURIType to = maps.getTo();
assert null != to;
addAcknowledgements(destination, rmpsOut, inSeqId, to);
--
To stop receiving notification emails like this one, please contact
dkulp@apache.org.
[cxf] 05/06: [CXF-7508] TerminateSequenceResponse does not have
acknowledgments
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 409d1b095daa2db8c8351c6504876283345b2ca0
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Mon Feb 26 12:23:19 2018 -0500
[CXF-7508] TerminateSequenceResponse does not have acknowledgments
(cherry picked from commit 134b173f26ccf58d60fe1bcaac9d253a1449feb9)
# Conflicts:
# rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
---
.../src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
index 0807f3d..d6e4522 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
@@ -111,7 +111,8 @@ public class RMOutInterceptor extends AbstractRMInterceptor<Message> {
// add Acknowledgements (to application messages or explicitly created Acknowledgement messages only)
boolean isAck = constants.getSequenceAckAction().equals(action);
boolean isClose = constants.getCloseSequenceAction().equals(action);
- if (isApplicationMessage || isAck || isClose) {
+ boolean isTerminate = constants.getTerminateSequenceAction().equals(action);
+ if (isApplicationMessage || isAck || isClose || isTerminate) {
AttributedURIType to = maps.getTo();
assert null != to;
addAcknowledgements(destination, rmpsOut, inSeqId, to);
@@ -120,8 +121,8 @@ public class RMOutInterceptor extends AbstractRMInterceptor<Message> {
msg.remove(Message.EMPTY_PARTIAL_RESPONSE_MESSAGE);
isAck = true;
}
- }
- if (isAck || (constants.getTerminateSequenceAction().equals(action)
+ }
+ if (isAck || (isTerminate
&& RM10Constants.NAMESPACE_URI.equals(rmNamespace))) {
maps.setReplyTo(RMUtils.createNoneReference());
}
@@ -165,6 +166,9 @@ public class RMOutInterceptor extends AbstractRMInterceptor<Message> {
}
void addAcknowledgements(Destination destination, RMProperties rmpsOut, Identifier inSeqId, AttributedURIType to) {
+ if (destination == null) {
+ return;
+ }
for (DestinationSequence seq : destination.getAllSequences()) {
if (!seq.sendAcknowledgement()) {
if (LOG.isLoggable(Level.FINE)) {
--
To stop receiving notification emails like this one, please contact
dkulp@apache.org.