Repository: tomee Updated Branches: refs/heads/master 2f48d94ab -> 3e2fe0af9
sync issue in tests Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/5c40cd9a Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/5c40cd9a Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/5c40cd9a Branch: refs/heads/master Commit: 5c40cd9ad2faf36abf3ee0b1670de911ed3d275e Parents: 2f48d94 Author: Romain manni-Bucau <rmannibu...@gmail.com> Authored: Fri Feb 19 08:06:11 2016 +0100 Committer: Romain manni-Bucau <rmannibu...@gmail.com> Committed: Fri Feb 19 08:06:11 2016 +0100 ---------------------------------------------------------------------- .../openejb/itest/legacy/LegacyServerTest.java" | 338 ++++++++++++++++++ .../cxf/rs/logging/LoggingJAXRSCommons.java | 10 +- .../OpenEJBHttpDestinationFactory.java" | 34 ++ .../server/cxf/transport/event/BusCreated.java" | 33 ++ .../util/CxfContainerClassLoader.java" | 132 +++++++ .../server/cxf/transport/util/CxfUtil.java" | 356 +++++++++++++++++++ 6 files changed, 900 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/5c40cd9a/"itests/legacy-server\263src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java"; ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/5c40cd9a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/logging/LoggingJAXRSCommons.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/logging/LoggingJAXRSCommons.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/logging/LoggingJAXRSCommons.java index 64bbe77..9db17af 100644 --- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/logging/LoggingJAXRSCommons.java +++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/logging/LoggingJAXRSCommons.java @@ -51,7 +51,7 @@ public class LoggingJAXRSCommons { protected static int port = -1; protected Collection<String> msgs; - protected boolean assertJAXRSConfiguration() { + protected synchronized boolean assertJAXRSConfiguration() { final Iterator<String> iterator = msgs.iterator(); while (iterator.hasNext()) { if (iterator.next().contains("Registered JAX-RS Configuration:")) { @@ -121,7 +121,9 @@ public class LoggingJAXRSCommons { looger.addHandler(new Handler() { @Override public void publish(final LogRecord record) { - msgs.add(record.getMessage()); + synchronized (LoggingJAXRSCommons.this) { + msgs.add(record.getMessage()); + } } @Override @@ -135,7 +137,9 @@ public class LoggingJAXRSCommons { } public Collection getMsg() { - return msgs; + synchronized (LoggingJAXRSCommons.this) { + return msgs; + } } }); } http://git-wip-us.apache.org/repos/asf/tomee/blob/5c40cd9a/"server/openejb-cxf-transport\323src/main/java/org/apache/openejb/server/cxf/transport/OpenEJBHttpDestinationFactory.java"; ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/5c40cd9a/"server/openejb-cxf-transport\323src/main/java/org/apache/openejb/server/cxf/transport/event/BusCreated.java"; ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/5c40cd9a/"server/openejb-cxf-transport\323src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java"; ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/5c40cd9a/"server/openejb-cxf-transport\323src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java"; ----------------------------------------------------------------------
