Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
UNDERTOW-1239 UnavailableException not handled correctly
- Loading branch information
1 parent
e70e8a4
commit 6b00cd2
Showing
4 changed files
with
159 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
servlet/src/test/java/io/undertow/servlet/test/spec/UnavailableServlet.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
package io.undertow.servlet.test.spec; | ||
|
||
import javax.servlet.Servlet; | ||
import javax.servlet.ServletConfig; | ||
import javax.servlet.ServletException; | ||
import javax.servlet.ServletRequest; | ||
import javax.servlet.ServletResponse; | ||
import javax.servlet.UnavailableException; | ||
import java.io.IOException; | ||
|
||
/** | ||
* @author Stuart Douglas | ||
*/ | ||
public class UnavailableServlet implements Servlet { | ||
|
||
static final String PERMANENT = "permanent"; | ||
static boolean first = true; | ||
|
||
@Override | ||
public void init(ServletConfig config) throws ServletException { | ||
if(config.getInitParameter(PERMANENT) != null) { | ||
throw new UnavailableException("msg"); | ||
} else if(first){ | ||
first = false; | ||
throw new UnavailableException("msg", 1); | ||
} | ||
} | ||
|
||
@Override | ||
public ServletConfig getServletConfig() { | ||
return null; | ||
} | ||
|
||
@Override | ||
public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException { | ||
|
||
} | ||
|
||
@Override | ||
public String getServletInfo() { | ||
return null; | ||
} | ||
|
||
@Override | ||
public void destroy() { | ||
|
||
} | ||
} |
71 changes: 71 additions & 0 deletions
71
servlet/src/test/java/io/undertow/servlet/test/spec/UnavailableServletTestCase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
package io.undertow.servlet.test.spec; | ||
|
||
import io.undertow.servlet.test.util.DeploymentUtils; | ||
import io.undertow.testutils.DefaultServer; | ||
import io.undertow.testutils.HttpClientUtils; | ||
import io.undertow.testutils.TestHttpClient; | ||
import io.undertow.util.StatusCodes; | ||
import org.apache.http.HttpResponse; | ||
import org.apache.http.client.methods.HttpGet; | ||
import org.junit.Assert; | ||
import org.junit.BeforeClass; | ||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
|
||
import javax.servlet.ServletException; | ||
|
||
import java.io.IOException; | ||
|
||
import static io.undertow.servlet.Servlets.servlet; | ||
|
||
/** | ||
* @author Stuart Douglas | ||
*/ | ||
@RunWith(DefaultServer.class) | ||
public class UnavailableServletTestCase { | ||
|
||
|
||
@BeforeClass | ||
public static void setup() throws ServletException { | ||
DeploymentUtils.setupServlet( | ||
servlet("p", UnavailableServlet.class) | ||
.addInitParam(UnavailableServlet.PERMANENT, "1") | ||
.addMapping("/p"), | ||
servlet("t", UnavailableServlet.class) | ||
.addMapping("/t")); | ||
|
||
} | ||
|
||
@Test | ||
public void testPermanentUnavailableServlet() throws IOException { | ||
TestHttpClient client = new TestHttpClient(); | ||
try { | ||
HttpGet get = new HttpGet(DefaultServer.getDefaultServerURL() + "/servletContext/p"); | ||
HttpResponse result = client.execute(get); | ||
Assert.assertEquals(StatusCodes.NOT_FOUND, result.getStatusLine().getStatusCode()); | ||
HttpClientUtils.readResponse(result); | ||
} finally { | ||
client.getConnectionManager().shutdown(); | ||
} | ||
} | ||
|
||
|
||
@Test | ||
public void testTempUnavailableServlet() throws IOException, InterruptedException { | ||
TestHttpClient client = new TestHttpClient(); | ||
try { | ||
HttpGet get = new HttpGet(DefaultServer.getDefaultServerURL() + "/servletContext/t"); | ||
HttpResponse result = client.execute(get); | ||
Assert.assertEquals(StatusCodes.SERVICE_UNAVAILABLE, result.getStatusLine().getStatusCode()); | ||
HttpClientUtils.readResponse(result); | ||
Thread.sleep(1001); | ||
|
||
get = new HttpGet(DefaultServer.getDefaultServerURL() + "/servletContext/t"); | ||
result = client.execute(get); | ||
Assert.assertEquals(StatusCodes.OK, result.getStatusLine().getStatusCode()); | ||
HttpClientUtils.readResponse(result); | ||
} finally { | ||
client.getConnectionManager().shutdown(); | ||
} | ||
} | ||
} |