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/02/28 15:58:26 UTC
[1/2] cxf git commit: More work to try and fix randomly failing test
Repository: cxf
Updated Branches:
refs/heads/master eb31ffe4f -> 8fa9b8b14
More work to try and fix randomly failing test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7ace8c84
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7ace8c84
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7ace8c84
Branch: refs/heads/master
Commit: 7ace8c84cff4696e365800fbba12cc789e97971f
Parents: eb31ffe
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Feb 28 10:40:44 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 28 10:40:44 2017 -0500
----------------------------------------------------------------------
.../org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java | 5 ++++-
.../org/apache/cxf/jaxrs/client/logging/TestEventSender.java | 6 +++---
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/7ace8c84/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
index 980a744..a742caf 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
@@ -64,10 +64,11 @@ public class RESTLoggingTest {
client.get(InputStream.class).close();
loggingFeature.setLogBinary(true);
client.get(InputStream.class).close();
+ client.close();
+ server.stop();
server.destroy();
List<LogEvent> events = sender.getEvents();
- Assert.assertEquals(8, events.size());
assertLogged(events.get(0));
assertLogged(events.get(1));
assertNotLogged(events.get(2));
@@ -76,6 +77,8 @@ public class RESTLoggingTest {
assertLogged(events.get(4));
assertLogged(events.get(5));
assertLogged(events.get(6));
+
+ Assert.assertEquals(8, events.size());
assertLogged(events.get(7));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/7ace8c84/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/TestEventSender.java
----------------------------------------------------------------------
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/TestEventSender.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/TestEventSender.java
index c247631..2585f92 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/TestEventSender.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/TestEventSender.java
@@ -18,15 +18,15 @@
*/
package org.apache.cxf.jaxrs.client.logging;
-import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
import org.apache.cxf.ext.logging.event.LogEvent;
import org.apache.cxf.ext.logging.event.LogEventSender;
final class TestEventSender implements LogEventSender {
- private final List<LogEvent> events = new ArrayList<>();
-
+ private final List<LogEvent> events = new CopyOnWriteArrayList<>();
+
@Override
public void send(LogEvent event) {
events.add(event);
[2/2] cxf git commit: Update to support latest Spring version
Posted by dk...@apache.org.
Update to support latest Spring version
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8fa9b8b1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8fa9b8b1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8fa9b8b1
Branch: refs/heads/master
Commit: 8fa9b8b14b391a419569c1050d2a5a6ffa37710d
Parents: 7ace8c8
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Feb 28 10:58:08 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 28 10:58:08 2017 -0500
----------------------------------------------------------------------
.../java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java | 4 ++++
parent/pom.xml | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8fa9b8b1/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java b/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
index d5c8766..2ad66d7 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
@@ -154,4 +154,8 @@ public class Jsr250BeanPostProcessor
}
}
+ public boolean requiresDestruction(Object bean) {
+ return isProcessing;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8fa9b8b1/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 139fe97..b7a3e0d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -146,7 +146,7 @@
<cxf.servlet-api-2.5.version>1.1.2</cxf.servlet-api-2.5.version>
<cxf.slf4j.version>1.7.24</cxf.slf4j.version>
<cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
- <cxf.spring.version>4.2.9.RELEASE</cxf.spring.version>
+ <cxf.spring.version>4.3.6.RELEASE</cxf.spring.version>
<cxf.spring.boot.version>1.5.1.RELEASE</cxf.spring.boot.version>
<cxf.spring.security.version>4.2.1.RELEASE</cxf.spring.security.version>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>