From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 7 Feb 2010 21:20:00 +0000 (+0000)
Subject: Actually used the new jspConfigDescriptor
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=b7a098e523a0a1f54c2c44159e60ebd044ffa0cd;p=tomcat7.0

Actually used the new jspConfigDescriptor

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

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index 333c7ee7e..34636d422 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -55,7 +55,6 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequestAttributeListener;
 import javax.servlet.ServletRequestListener;
 import javax.servlet.descriptor.JspConfigDescriptor;
-import javax.servlet.descriptor.TaglibDescriptor;
 import javax.servlet.http.HttpSessionAttributeListener;
 import javax.servlet.http.HttpSessionListener;
 
@@ -2054,7 +2053,7 @@ public class StandardContext
 
     
     public JspConfigDescriptor getJspConfigDescriptor() {
-        return null;
+        return jspConfigDescriptor;
     }