You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/09/15 22:28:14 UTC
svn commit: r1625156 - in /tomee/tomee/trunk/tomee/tomee-embedded/src:
main/java/org/apache/tomee/embedded/Container.java
test/java/org/apache/tomee/embedded/SslTomEETest.java
test/java/org/apache/tomee/embedded/TomEEUndeployTest.java
Author: rmannibucau
Date: Mon Sep 15 20:28:13 2014
New Revision: 1625156
URL: http://svn.apache.org/r1625156
Log:
close is enough
Modified:
tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
tomee/tomee/trunk/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/SslTomEETest.java
tomee/tomee/trunk/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/TomEEUndeployTest.java
Modified: tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java?rev=1625156&r1=1625155&r2=1625156&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java (original)
+++ tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java Mon Sep 15 20:28:13 2014
@@ -65,7 +65,6 @@ import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import java.util.concurrent.CountDownLatch;
/**
* @version $Rev$ $Date$
@@ -511,37 +510,7 @@ public class Container implements AutoCl
@Override
public void close() throws Exception {
- final CountDownLatch end = new CountDownLatch(1);
- new Thread() {
- {
- setName("tomee-embedded-await-" + hashCode());
- }
-
- @Override
- public void run() {
- try {
- Container.this.await();
- end.countDown();
- } catch (final Exception e) {
- throw new IllegalStateException(e);
- }
- }
- }.start();
- new Thread() {
- {
- setName("tomee-embedded-stop-" + hashCode());
- }
-
- @Override
- public void run() {
- try {
- Container.this.stop();
- } catch (final Exception e) {
- throw new IllegalStateException(e);
- }
- }
- }.start();
- end.await();
+ stop();
}
public org.apache.catalina.Context addContext(final String context, final String path) {
Modified: tomee/tomee/trunk/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/SslTomEETest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/SslTomEETest.java?rev=1625156&r1=1625155&r2=1625156&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/SslTomEETest.java (original)
+++ tomee/tomee/trunk/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/SslTomEETest.java Mon Sep 15 20:28:13 2014
@@ -82,7 +82,7 @@ public class SslTomEETest {
try {
assertFalse(ManagementFactory.getPlatformMBeanServer().isRegistered(new ObjectName("Tomcat:type=ProtocolHandler,port=8443")));
} finally {
- container.stop();
+ container.close();
}
}
Modified: tomee/tomee/trunk/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/TomEEUndeployTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/TomEEUndeployTest.java?rev=1625156&r1=1625155&r2=1625156&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/TomEEUndeployTest.java (original)
+++ tomee/tomee/trunk/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/TomEEUndeployTest.java Mon Sep 15 20:28:13 2014
@@ -125,6 +125,6 @@ public class TomEEUndeployTest {
@After
public void stop() throws Exception {
- container.stop();
+ container.close();
}
}