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/06/20 19:13:24 UTC
[1/3] cxf git commit: [CXF-7415] RM messages would not have anything
asserted at this point, just results in bogus logs
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes aa3751e44 -> c11ceb41b
[CXF-7415] RM messages would not have anything asserted at this point, just results in bogus logs
# Conflicts:
# rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3aa082f6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3aa082f6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3aa082f6
Branch: refs/heads/3.1.x-fixes
Commit: 3aa082f6ae201dba8e49ab2e60374d30364e18c7
Parents: aa3751e
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Jun 20 13:21:43 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Jun 20 14:30:00 2017 -0400
----------------------------------------------------------------------
.../apache/cxf/ws/rm/DestinationSequence.java | 48 +++++++-------------
.../org/apache/cxf/ws/rm/RMInInterceptor.java | 7 ++-
2 files changed, 19 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/3aa082f6/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
index a11eb67..51b2970 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
@@ -41,7 +41,6 @@ import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.ws.policy.PolicyVerificationInInterceptor;
import org.apache.cxf.ws.rm.RMConfiguration.DeliveryAssurance;
import org.apache.cxf.ws.rm.manager.AcksPolicyType;
import org.apache.cxf.ws.rm.persistence.PersistenceUtils;
@@ -184,39 +183,24 @@ public class DestinationSequence extends AbstractSequence {
if (updated) {
RMStore store = destination.getManager().getStore();
- if (null != store) {
- // only save message, when policy verification is successful
- // otherwise msgs will be stored and redelivered which do not pass initial verification
- // as interceptor is called in a later phase than the capturing
- PolicyVerificationInInterceptor intercep = new PolicyVerificationInInterceptor();
- boolean policiesVerified = false;
+ if (null != store && !MessageUtils.isTrue(message.getContextualProperty(Message.ROBUST_ONEWAY))) {
try {
- intercep.handleMessage(message);
- policiesVerified = true;
- } catch (Fault e) {
- // Ignore
- }
- RMMessage msg = null;
- if (policiesVerified
- && !MessageUtils.isTrue(message.getContextualProperty(Message.ROBUST_ONEWAY))) {
- try {
- msg = new RMMessage();
- CachedOutputStream cos = (CachedOutputStream)message
- .get(RMMessageConstants.SAVED_CONTENT);
- msg.setMessageNumber(st.getMessageNumber());
- msg.setCreatedTime(rmps.getCreatedTime());
- // in case no attachments are available, cos can be saved directly
- if (message.getAttachments() == null) {
- msg.setContent(cos);
- msg.setContentType((String)message.get(Message.CONTENT_TYPE));
- } else {
- InputStream is = cos.getInputStream();
- PersistenceUtils.encodeRMContent(msg, message, is);
- }
- store.persistIncoming(this, msg);
- } catch (IOException e) {
- throw new Fault(e);
+ RMMessage msg = new RMMessage();
+ CachedOutputStream cos = (CachedOutputStream)message
+ .get(RMMessageConstants.SAVED_CONTENT);
+ msg.setMessageNumber(st.getMessageNumber());
+ msg.setCreatedTime(rmps.getCreatedTime());
+ // in case no attachments are available, cos can be saved directly
+ if (message.getAttachments() == null) {
+ msg.setContent(cos);
+ msg.setContentType((String)message.get(Message.CONTENT_TYPE));
+ } else {
+ InputStream is = cos.getInputStream();
+ PersistenceUtils.encodeRMContent(msg, message, is);
}
+ store.persistIncoming(this, msg);
+ } catch (IOException e) {
+ throw new Fault(e);
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/3aa082f6/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
index c82412b..a70075a 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
@@ -187,8 +187,9 @@ public class RMInInterceptor extends AbstractRMInterceptor<Message> {
RMEndpoint rme = getManager().getReliableEndpoint(message);
Destination destination = getManager().getDestination(message);
-
- if (isApplicationMessage) {
+
+ assertReliability(message);
+ if (isApplicationMessage) {
if (null != rmps) {
processAcknowledgments(rme, rmps, protocol);
processAcknowledgmentRequests(destination, message);
@@ -225,8 +226,6 @@ public class RMInInterceptor extends AbstractRMInterceptor<Message> {
return;
}
}
-
- assertReliability(message);
}
void processAcknowledgments(RMEndpoint rme, RMProperties rmps, ProtocolVariation protocol)
[2/3] cxf git commit: [CXF-7416] Switch to using thread safe
collections for the RM types since we send them directly into the marshal
routines
Posted by dk...@apache.org.
[CXF-7416] Switch to using thread safe collections for the RM types since we send them directly into the marshal routines
# Conflicts:
# rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0.xjb
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6f48d4a7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6f48d4a7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6f48d4a7
Branch: refs/heads/3.1.x-fixes
Commit: 6f48d4a7bc8ab908f3d6d977d3f68d1a0f20f8f4
Parents: 3aa082f
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Jun 20 13:55:36 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Jun 20 14:30:24 2017 -0400
----------------------------------------------------------------------
.../main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java | 2 +-
rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0-wsa15.xjb | 3 ++-
rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0.xjb | 3 ++-
rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.1.xjb | 3 ++-
4 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6f48d4a7/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
index a85971c..c41948c 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
@@ -164,7 +164,7 @@ public class RMCaptureOutInterceptor extends AbstractRMInterceptor<Message> {
seq = getManager().getSequence(inSeqId, msg, maps);
}
assert null != seq;
-
+
// increase message number and store a sequence type object in
// context
seq.nextMessageNumber(inSeqId, inMessageNumber, isLastMessage);
http://git-wip-us.apache.org/repos/asf/cxf/blob/6f48d4a7/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0-wsa15.xjb
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0-wsa15.xjb b/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0-wsa15.xjb
index b355d5a..ea1d8a7 100644
--- a/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0-wsa15.xjb
+++ b/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0-wsa15.xjb
@@ -22,6 +22,7 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
jaxb:extensionBindingPrefixes="xjc">
+
<jaxb:bindings schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd" node="/xs:schema">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.ws.addressing"/>
@@ -31,7 +32,7 @@
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.ws.rm.v200502wsa15"/>
</jaxb:schemaBindings>
- <jaxb:globalBindings generateIsSetMethod="true"/>
+ <jaxb:globalBindings generateIsSetMethod="true" collectionType="java.util.concurrent.CopyOnWriteArrayList"/>
</jaxb:bindings>
<jaxb:bindings schemaLocation="wsrm-1.0-wsa15.xsd" node="//xs:element[@name='Nack']">
<jaxb:property>
http://git-wip-us.apache.org/repos/asf/cxf/blob/6f48d4a7/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0.xjb
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0.xjb b/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0.xjb
index bae1955..547568e 100644
--- a/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0.xjb
+++ b/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0.xjb
@@ -22,6 +22,7 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
jaxb:extensionBindingPrefixes="xjc">
+
<jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/ws/2004/08/addressing" node="/xs:schema">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.ws.addressing.v200408"/>
@@ -31,7 +32,7 @@
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.ws.rm.v200502"/>
</jaxb:schemaBindings>
- <jaxb:globalBindings generateIsSetMethod="true"/>
+ <jaxb:globalBindings generateIsSetMethod="true" collectionType="java.util.concurrent.CopyOnWriteArrayList"/>
</jaxb:bindings>
<jaxb:bindings schemaLocation="wsrm-1.0.xsd" node="//xs:element[@name='Nack']">
<jaxb:property>
http://git-wip-us.apache.org/repos/asf/cxf/blob/6f48d4a7/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.1.xjb
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.1.xjb b/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.1.xjb
index 8e5858a..4ba7041 100644
--- a/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.1.xjb
+++ b/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.1.xjb
@@ -22,6 +22,7 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
jaxb:extensionBindingPrefixes="xjc">
+
<jaxb:bindings schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd" node="/xs:schema">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.ws.addressing"/>
@@ -31,7 +32,7 @@
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.ws.rm.v200702"/>
</jaxb:schemaBindings>
- <jaxb:globalBindings generateIsSetMethod="true"/>
+ <jaxb:globalBindings generateIsSetMethod="true" collectionType="java.util.concurrent.CopyOnWriteArrayList"/>
</jaxb:bindings>
<jaxb:bindings schemaLocation="wsrm-1.1.xsd" node="//xs:element[@name='Nack']">
<jaxb:property>
[3/3] cxf git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c11ceb41
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c11ceb41
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c11ceb41
Branch: refs/heads/3.1.x-fixes
Commit: c11ceb41b794db8380c69a77320465b6e021e849
Parents: 6f48d4a
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Jun 20 14:30:24 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Jun 20 14:30:24 2017 -0400
----------------------------------------------------------------------
.gitmergeinfo | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c11ceb41/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index e1d1f726..b371d4e 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -192,6 +192,7 @@ B 762093f79fb799e3912ce572213f1a46eb02867c
B 76d165c9f7d76de1e333eded6106fa0cc186131b
B 76edf9350e7640860b66196ad40396d54bbcb2b2
B 77c3f51dcb1f02c8799f4e09676c0697e76a0756
+B 77e0ffed1a647a159d7b249071de87c049803885
B 79244372958dc1a9e382db4e1740e248bc8e2538
B 7a5e2690c36914ba481570c811f23d6e6b80bc07
B 7b7629682d15345518e66d46e575bf1ac334cf00
@@ -401,6 +402,7 @@ B fd77d3f3380f805db3547d37cbb2ff72bd033ad0
B fe3fd44a80d12efd7a4bc6f965451e63d63ee84c
M 00148006c5bc489794f2774134fcbebf1cd5f2f4
M 016140cc85a5c05ec762d4e4e092c259f76eb922
+M 01933b8ae96dfef103d1bdc9fc922f644c581485
M 01cd14ce923f1f2cd044746e272b2d525c46f9a6
M 01d06cee06203b0ba616ca1924f1878aecc1a791
M 01fdc40526185ee89202692088fd5367f0690af0
@@ -517,6 +519,7 @@ M 6242c682dfce4a2ba4869978c28b14f1472484c1
M 62f994427bdd12863dc987e348eec1e24e6ce849
M 631ac6ba0765022a0f53500ac986b61cbabca60c
M 63a1088a9253da0452497440e900d35a5415c3c9
+M 63e100e48f7c34ec167728497a3ef006a7a34024
M 65c1204abcef8720d4eb985d58e3f865e39a1da3
M 6613e46662317ea151f72e26e5deb4f50148a148
M 66e97c77eaa43ab3a2cd95f0edc6a27e7445e8ce
@@ -549,6 +552,7 @@ M 855d033766dc31a76e8cf1a38b6ef8eb7490a23e
M 8583a24ac541dc373503d7a6c59cd90890acdae3
M 85c390abd81c0a5590e83b2d5bd9c6cfc2f3bddc
M 86667619dc61c8a84672fc5a583b4517f48176c5
+M 88d03f562405f0b1bbdb16b336810074b853db86
M 896f1abec915897967905762d6e850cfb6bac3bc
M 8aebfa30047f32e3a6b4feb7ffdd89208ec4f435
M 8b78d8c82accc1f0beca55eef8d5bce87c7af792
@@ -569,6 +573,7 @@ M 93b07cfd3c39f6eb62ec1f428174811a87307ba2
M 94060fc026b3b7214337c9fcfce71c06f0fb4444
M 955fd4b7fee79642934a828b7758ce14f783364a
M 97b20f61bbf7054076c8cdf609beb8a7047105b8
+M 998ce1e5df26773dc96d130b9b55c7d6eec746e7
M 99f6eb63fa7da2a29ea9d28f1c55c5cb90a09222
M 9a9e0a8a37608195c4ef6fbf386728d13d025d2d
M 9b2bda583c09861c693122ab631c4bffa2187ddd
@@ -647,6 +652,7 @@ M dd3cb8eb84f1f17ebadb4104873faa4f17377a96
M dd421381bcf61ead2a66311f1caf9ebdfcbf06c4
M ded06c40ba057981e003903faa93beb94cbe11fa
M df3854cefae5d2da71f8d222a86218e81df7bd05
+M df47c2d60100ac528b12f862166e3ac59d72f751
M e00b84269aa8112bf4073b69b58f933fda3ab497
M e0ace3dc71a45a9bee6223e550f2ad869581c12d
M e0ed46f9f99ac1ec3e0925b3e5666e0b7a69af53