remm 01/05/30 20:56:16
Modified: catalina/src/share/org/apache/catalina/startup
ContextConfig.java
Log:
- Remove useless thread bind / unbind (which are now all done in StandardContext).
Revision Changes Path
1.46 +4 -10
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
Index: ContextConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ContextConfig.java 2001/05/08 21:22:36 1.45
+++ ContextConfig.java 2001/05/31 03:56:11 1.46
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.45 2001/05/08 21:22:36 craigmcc Exp $
- * $Revision: 1.45 $
- * $Date: 2001/05/08 21:22:36 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.46 2001/05/31 03:56:11 remm Exp $
+ * $Revision: 1.46 $
+ * $Date: 2001/05/31 03:56:11 $
*
* ====================================================================
*
@@ -87,7 +87,6 @@
import javax.naming.NameClassPair;
import javax.naming.NamingEnumeration;
import javax.naming.directory.DirContext;
-import org.apache.naming.resources.DirContextURLStreamHandler;
import org.apache.catalina.Authenticator;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
@@ -121,7 +120,7 @@
* of that Context, and the associated defined servlets.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.45 $ $Date: 2001/05/08 21:22:36 $
+ * @version $Revision: 1.46 $ $Date: 2001/05/31 03:56:11 $
*/
public final class ContextConfig
@@ -818,7 +817,6 @@
XmlMapper mapper = createWebMapper();
defaultConfig(mapper);
applicationConfig(mapper);
- //DirContextURLStreamHandlerFactory.bind(context.getResources());
// Scan tag library descriptor files for additional listener classes
if (ok)
@@ -855,8 +853,6 @@
context.setAvailable(false);
}
- //DirContextURLStreamHandlerFactory.unbind();
-
}
@@ -950,12 +946,10 @@
URL url = context.getServletContext().getResource(resourcePath);
if (url == null)
return (false);
- DirContextURLStreamHandler.bind(context.getResources());
url = new URL("jar:" + url.toString() + "!/");
JarURLConnection conn =
(JarURLConnection) url.openConnection();
jarFile = conn.getJarFile();
- DirContextURLStreamHandler.unbind();
boolean found = false;
Enumeration entries = jarFile.entries();
while (entries.hasMoreElements()) {
