deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gpetra...@apache.org
Subject git commit: DELTASPIKE-764 fixed missing shutdown in servlet-container tests
Date Sat, 01 Nov 2014 12:55:43 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master 2a94f8c23 -> ad3e0607c


DELTASPIKE-764 fixed missing shutdown in servlet-container tests


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/ad3e0607
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/ad3e0607
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/ad3e0607

Branch: refs/heads/master
Commit: ad3e0607c92b891809b6221dacf3e584d19de7bb
Parents: 2a94f8c
Author: gpetracek <gpetracek@apache.org>
Authored: Sat Nov 1 13:37:34 2014 +0100
Committer: gpetracek <gpetracek@apache.org>
Committed: Sat Nov 1 13:37:34 2014 +0100

----------------------------------------------------------------------
 .../cdise/servlet/test/EmbeddedServletContainer.java      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/ad3e0607/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/EmbeddedServletContainer.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/EmbeddedServletContainer.java
b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/EmbeddedServletContainer.java
index dc620c0..c99118b 100644
--- a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/EmbeddedServletContainer.java
+++ b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/EmbeddedServletContainer.java
@@ -64,7 +64,15 @@ public abstract class EmbeddedServletContainer
         cdiContainer.getContextControl().startContexts();
         int port = createServer();
         testRead(port);
-        shutdown();
+
+        try
+        {
+            shutdown();
+        }
+        finally
+        {
+            cdiContainer.shutdown(); //also calls #stopContexts
+        }
     }
 
     private void testRead(int port) throws Exception


Mime
View raw message