Author: remm
Date: Thu Apr 13 14:51:35 2006
New Revision: 393953
URL: http://svn.apache.org/viewcvs?rev=393953&view=rev
Log:
- Port patches.
- verifyIfValid in Session.access seems useless.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=393953&r1=393952&r2=393953&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
Thu Apr 13 14:51:35 2006
@@ -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"/>
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java?rev=393953&r1=393952&r2=393953&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
Thu Apr 13 14:51:35 2006
@@ -590,7 +590,6 @@
* @param isValid The new value for the <code>isValid</code> flag
*/
public void setValid(boolean isValid) {
-
this.isValid = isValid;
}
@@ -607,9 +606,6 @@
this.lastAccessedTime = this.thisAccessedTime;
this.thisAccessedTime = System.currentTimeMillis();
-
- evaluateIfValid();
-
accessCount++;
}
@@ -1491,19 +1487,6 @@
}
return false;
- }
-
-
- 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();
-
}
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
URL:
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=393953&r1=393952&r2=393953&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java Thu
Apr 13 14:51:35 2006
@@ -22,6 +22,7 @@
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 @@
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",
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=393953&r1=393952&r2=393953&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Thu Apr 13 14:51:35 2006
@@ -455,6 +455,10 @@
// 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(
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
URL:
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=393953&r1=393952&r2=393953&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
Thu Apr 13 14:51:35 2006
@@ -184,13 +184,7 @@
* Release any resources allocated for this directory context.
*/
public void release() {
-
- caseSensitive = true;
- allowLinking = false;
- absoluteBase = null;
- base = null;
super.release();
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
