From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 14 Jan 2009 21:54:39 +0000 (+0000)
Subject: Implement the simple stuff
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f1c69455ccbe66d48f9050bfd95f1fd99986fc87;p=tomcat7.0

Implement the simple stuff

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@734526 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/connector/RequestFacade.java b/java/org/apache/catalina/connector/RequestFacade.java
index 387a2e6db..8f4383f90 100644
--- a/java/org/apache/catalina/connector/RequestFacade.java
+++ b/java/org/apache/catalina/connector/RequestFacade.java
@@ -956,8 +956,12 @@ public class RequestFacade implements HttpServletRequest {
 
 
     public ServletContext getServletContext() {
-        // TODO SERVLET3
-        return null;
+        if (request == null) {
+            throw new IllegalStateException(
+                            sm.getString("requestFacade.nullRequest"));
+        }
+
+        return request.getServletContext();
     }