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/08 17:02:10 UTC
cxf git commit: Remove some unused code,
reduce time of some tests by a few seconds
Repository: cxf
Updated Branches:
refs/heads/master 3d85f3179 -> 089ba5825
Remove some unused code, reduce time of some tests by a few seconds
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/089ba582
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/089ba582
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/089ba582
Branch: refs/heads/master
Commit: 089ba5825c6ff173358f0a4da1fe20b9cfa7543c
Parents: 3d85f31
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Jun 8 13:01:52 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Jun 8 13:01:52 2017 -0400
----------------------------------------------------------------------
.../rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder.java | 4 ----
.../cxf/systest/ws/rm/AbstractServerPersistenceTest.java | 7 ++++++-
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/089ba582/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder.java
index 3717a18..6e8b184 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder.java
@@ -24,7 +24,6 @@ import java.util.List;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
@@ -144,9 +143,6 @@ public abstract class EncoderDecoder {
return;
}
- // build individual headers
- Marshaller marshaller = getContext().createMarshaller();
- marshaller.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
buildHeaders(seq, acks, reqs, rmps.isLastMessage(), headers);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/089ba582/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java
index 5d16d2c..9feee4e 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java
@@ -269,8 +269,13 @@ public abstract class AbstractServerPersistenceTest extends AbstractBusClientSer
void verifyRetransmissionQueue() throws Exception {
awaitMessages(2, 2, 60000);
- Thread.sleep(5000);
+ int count = 0;
boolean empty = greeterBus.getExtension(RMManager.class).getRetransmissionQueue().isEmpty();
+ while (count < 50 && !empty) {
+ Thread.sleep(100);
+ empty = greeterBus.getExtension(RMManager.class).getRetransmissionQueue().isEmpty();
+ count++;
+ }
assertTrue("Retransmission Queue is not empty", empty);
}