From: remm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 13 Apr 2006 21:51:35 +0000 (+0000)
Subject: - Port patches.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=400c799dd787e70c4abba4e324a5e62b2b1eb0d0;p=tomcat7.0

- 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 dcf0ac5d0..bc0f6b966 100644
--- 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"
                type="java.lang.Object"/>
       
+    <attribute name="namingContextListener"
+               description="Associated naming context listener."
+               type="org.apache.catalina.core.NamingContextListener" />
+      
     <attribute name="objectName"
                description="Name of the object"
                type="java.lang.String"/>
diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java
index 5749dc270..1a5088e5b 100644
--- 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
      */
     public void setValid(boolean isValid) {
-
         this.isValid = isValid;
     }
 
@@ -607,9 +606,6 @@ public class StandardSession
 
         this.lastAccessedTime = this.thisAccessedTime;
         this.thisAccessedTime = System.currentTimeMillis();
-
-        evaluateIfValid();
-
         accessCount++;
 
     }
@@ -1494,19 +1490,6 @@ public class StandardSession
     }
 
 
-    protected void evaluateIfValid() {
-        /*
-     * If this session has expired or is in the process of expiring or
-     * will never expire, return
-     */
-        if (!this.isValid || expiring || maxInactiveInterval < 0)
-            return;
-
-        isValid();
-
-    }
-
-
     // ------------------------------------------------------ Protected Methods
 
 
diff --git a/java/org/apache/catalina/startup/TldConfig.java b/java/org/apache/catalina/startup/TldConfig.java
index 46e2613c6..68e4f2c60 100644
--- 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;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.net.URL;
@@ -534,9 +535,14 @@ public final class TldConfig  {
 
         InputSource inputSource = null;
         try {
-            inputSource =
-                new InputSource(
-                    context.getServletContext().getResourceAsStream(resourcePath));
+            InputStream stream =
+                context.getServletContext().getResourceAsStream(resourcePath);
+            if (stream == null) {
+                throw new IllegalArgumentException
+                (sm.getString("contextConfig.tldResourcePath",
+                        resourcePath));
+            }
+            inputSource = new InputSource(stream);
             if (inputSource == null) {
                 throw new IllegalArgumentException
                     (sm.getString("contextConfig.tldResourcePath",
diff --git a/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java b/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
index fbea8bff0..d7d4681a8 100644
--- 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
             } else if ("tag-extension".equals(tname)) {
                 // Ignore <tag-extension> element: Bugzilla 33538
+            } else if ("icon".equals(tname) 
+                    || "display-name".equals(tname) 
+                    || "description".equals(tname)) {
+                // Ignore these elements: Bugzilla 38015
             } else {
                 if (log.isWarnEnabled()) {
                     log.warn(Localizer.getMessage(
diff --git a/java/org/apache/naming/resources/FileDirContext.java b/java/org/apache/naming/resources/FileDirContext.java
index 741081904..de3ace950 100644
--- 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.
      */
     public void release() {
-
-        caseSensitive = true;
-        allowLinking = false;
-        absoluteBase = null;
-        base = null;
         super.release();
-
     }