- Port patches.

- verifyIfValid in Session.access seems useless.

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

diff --git a/java/org/apache/catalina/core/mbeans-descriptors.xml b/java/org/apache/catalina/core/mbeans-descriptors.xml
index dcf0ac5..bc0f6b9 100644 (file)
--- a/java/org/apache/catalina/core/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/core/mbeans-descriptors.xml
@@ -125,6 +125,10 @@
                description="The object used for mapping"\r
                type="java.lang.Object"/>\r
       \r
+    <attribute name="namingContextListener"\r
+               description="Associated naming context listener."\r
+               type="org.apache.catalina.core.NamingContextListener" />\r
+      \r
     <attribute name="objectName"\r
                description="Name of the object"\r
                type="java.lang.String"/>\r

diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java
index 5749dc2..1a5088e 100644 (file)
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -590,7 +590,6 @@ public class StandardSession
      * @param isValid The new value for the <code>isValid</code> flag\r
      */\r
     public void setValid(boolean isValid) {\r
-\r
         this.isValid = isValid;\r
     }\r
 \r
@@ -607,9 +606,6 @@ public class StandardSession
 \r
         this.lastAccessedTime = this.thisAccessedTime;\r
         this.thisAccessedTime = System.currentTimeMillis();\r
-\r
-        evaluateIfValid();\r
-\r
         accessCount++;\r
 \r
     }\r
@@ -1494,19 +1490,6 @@ public class StandardSession
     }\r
 \r
 \r
-    protected void evaluateIfValid() {\r
-        /*\r
-     * If this session has expired or is in the process of expiring or\r
-     * will never expire, return\r
-     */\r
-        if (!this.isValid || expiring || maxInactiveInterval < 0)\r
-            return;\r
-\r
-        isValid();\r
-\r
-    }\r
-\r
-\r
     // ------------------------------------------------------ Protected Methods\r
 \r
 \r

diff --git a/java/org/apache/catalina/startup/TldConfig.java b/java/org/apache/catalina/startup/TldConfig.java
index 46e2613..68e4f2c 100644 (file)
--- a/java/org/apache/catalina/startup/TldConfig.java
+++ b/java/org/apache/catalina/startup/TldConfig.java
@@ -22,6 +22,7 @@ import java.io.File;
 import java.io.FileInputStream;\r
 import java.io.FileOutputStream;\r
 import java.io.IOException;\r
+import java.io.InputStream;\r
 import java.io.ObjectInputStream;\r
 import java.io.ObjectOutputStream;\r
 import java.net.URL;\r
@@ -534,9 +535,14 @@ public final class TldConfig  {
 \r
         InputSource inputSource = null;\r
         try {\r
-            inputSource =\r
-                new InputSource(\r
-                    context.getServletContext().getResourceAsStream(resourcePath));\r
+            InputStream stream =\r
+                context.getServletContext().getResourceAsStream(resourcePath);\r
+            if (stream == null) {\r
+                throw new IllegalArgumentException\r
+                (sm.getString("contextConfig.tldResourcePath",\r
+                        resourcePath));\r
+            }\r
+            inputSource = new InputSource(stream);\r
             if (inputSource == null) {\r
                 throw new IllegalArgumentException\r
                     (sm.getString("contextConfig.tldResourcePath",\r

diff --git a/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java b/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
index fbea8bf..d7d4681 100644 (file)
--- a/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
+++ b/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
@@ -455,6 +455,10 @@ class TagLibraryInfoImpl extends TagLibraryInfo implements TagConstants {
                 // Ignore <example> element: Bugzilla 33538\r
             } else if ("tag-extension".equals(tname)) {\r
                 // Ignore <tag-extension> element: Bugzilla 33538\r
+            } else if ("icon".equals(tname) \r
+                    || "display-name".equals(tname) \r
+                    || "description".equals(tname)) {\r
+                // Ignore these elements: Bugzilla 38015\r
             } else {\r
                 if (log.isWarnEnabled()) {\r
                     log.warn(Localizer.getMessage(\r

diff --git a/java/org/apache/naming/resources/FileDirContext.java b/java/org/apache/naming/resources/FileDirContext.java
index 7410819..de3ace9 100644 (file)
--- a/java/org/apache/naming/resources/FileDirContext.java
+++ b/java/org/apache/naming/resources/FileDirContext.java
@@ -184,13 +184,7 @@ public class FileDirContext extends BaseDirContext {
      * Release any resources allocated for this directory context.\r
      */\r
     public void release() {\r
-\r
-        caseSensitive = true;\r
-        allowLinking = false;\r
-        absoluteBase = null;\r
-        base = null;\r
         super.release();\r
-\r
     }\r
 \r
 \r