tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util ProcessHelper.java
Date Sun, 25 Jan 2004 20:57:18 GMT
remm        2004/01/25 12:57:18

  Modified:    catalina/src/share/org/apache/catalina/startup
                        WebRuleSet.java ContextRuleSet.java
                        CopyParentClassLoaderRule.java
                        LifecycleListenerRule.java Catalina.java
                        SetDocBaseRule.java ContextConfig.java
               catalina/src/share/org/apache/catalina/core
                        StandardContext.java StandardHostValve.java
               catalina/src/share/org/apache/catalina/realm
                        MemoryRuleSet.java
               catalina/src/share/org/apache/catalina/util
                        ProcessHelper.java
  Log:
  - Remove deprecation with the digester.
  - Remove a few imports.
  
  Revision  Changes    Path
  1.9       +51 -47    jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/WebRuleSet.java
  
  Index: WebRuleSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/WebRuleSet.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- WebRuleSet.java	5 Mar 2003 21:42:22 -0000	1.8
  +++ WebRuleSet.java	25 Jan 2004 20:57:18 -0000	1.9
  @@ -154,12 +154,12 @@
        *  should be added.
        */
       public void addRuleInstances(Digester digester) {
  -        sessionConfig = new SetSessionConfig(digester);
  -        jspConfig = new SetJspConfig(digester);
  -        loginConfig = new SetLoginConfig(digester);
  +        sessionConfig = new SetSessionConfig();
  +        jspConfig = new SetJspConfig();
  +        loginConfig = new SetLoginConfig();
           
           digester.addRule(prefix + "web-app",
  -                         new SetPublicIdRule(digester, "setPublicId"));
  +                         new SetPublicIdRule("setPublicId"));
   
           digester.addCallMethod(prefix + "web-app/context-param",
                                  "addParameter", 2);
  @@ -170,7 +170,7 @@
                                  "setDisplayName", 0);
   
           digester.addRule(prefix + "web-app/distributable",
  -                         new SetDistributableRule(digester));
  +                         new SetDistributableRule());
   
           digester.addObjectCreate(prefix + "web-app/ejb-local-ref",
                                    "org.apache.catalina.deploy.ContextLocalEjb");
  @@ -378,7 +378,7 @@
                               "org.apache.catalina.deploy.SecurityConstraint");
   
           digester.addRule(prefix + "web-app/security-constraint/auth-constraint",
  -                         new SetAuthConstraintRule(digester));
  +                         new SetAuthConstraintRule());
           digester.addCallMethod(prefix + "web-app/security-constraint/auth-constraint/role-name",
                                  "addAuthRole", 0);
           digester.addCallMethod(prefix + "web-app/security-constraint/display-name",
  @@ -402,7 +402,7 @@
                                  "addSecurityRole", 0);
   
           digester.addRule(prefix + "web-app/servlet",
  -                         new WrapperCreateRule(digester));
  +                         new WrapperCreateRule());
           digester.addSetNext(prefix + "web-app/servlet",
                               "addChild",
                               "org.apache.catalina.Container");
  @@ -479,11 +479,11 @@
    */
   final class SetLoginConfig extends Rule {
       protected boolean isLoginConfigSet = false;
  -    public SetLoginConfig(Digester digester) {
  -        super(digester);
  +    public SetLoginConfig() {
       }
   
  -    public void begin(Attributes attributes) throws Exception {
  +    public void begin(String namespace, String name, Attributes attributes)
  +        throws Exception {
           if (isLoginConfigSet){
               throw new IllegalArgumentException(
               "<login-config> element is limited to 1 occurance");
  @@ -500,11 +500,11 @@
    */
   final class SetJspConfig extends Rule {
       protected boolean isJspConfigSet = false;
  -    public SetJspConfig(Digester digester) {
  -        super(digester);
  +    public SetJspConfig() {
       }
   
  -    public void begin(Attributes attributes) throws Exception {
  +    public void begin(String namespace, String name, Attributes attributes)
  +        throws Exception {
           if (isJspConfigSet){
               throw new IllegalArgumentException(
               "<jsp-config> element is limited to 1 occurance");
  @@ -521,11 +521,11 @@
    */
   final class SetSessionConfig extends Rule {
       protected boolean isSessionConfigSet = false;
  -    public SetSessionConfig(Digester digester) {
  -        super(digester);
  +    public SetSessionConfig() {
       }
   
  -    public void begin(Attributes attributes) throws Exception {
  +    public void begin(String namespace, String name, Attributes attributes)
  +        throws Exception {
           if (isSessionConfigSet){
               throw new IllegalArgumentException(
               "<session-config> element is limited to 1 occurance");
  @@ -543,16 +543,18 @@
   
   final class SetAuthConstraintRule extends Rule {
   
  -    public SetAuthConstraintRule(Digester digester) {
  -        super(digester);
  +    public SetAuthConstraintRule() {
       }
   
  -    public void begin(Attributes attributes) throws Exception {
  +    public void begin(String namespace, String name, Attributes attributes)
  +        throws Exception {
           SecurityConstraint securityConstraint =
               (SecurityConstraint) digester.peek();
           securityConstraint.setAuthConstraint(true);
  -        if (digester.getDebug() > 0)
  -            digester.log("Calling SecurityConstraint.setAuthConstraint(true)");
  +        if (digester.getLogger().isDebugEnabled()) {
  +            digester.getLogger()
  +               .debug("Calling SecurityConstraint.setAuthConstraint(true)");
  +        }
       }
   
   }
  @@ -565,16 +567,17 @@
   
   final class SetDistributableRule extends Rule {
   
  -    public SetDistributableRule(Digester digester) {
  -        super(digester);
  +    public SetDistributableRule() {
       }
   
  -    public void begin(Attributes attributes) throws Exception {
  +    public void begin(String namespace, String name, Attributes attributes)
  +        throws Exception {
           Context context = (Context) digester.peek();
           context.setDistributable(true);
  -        if (digester.getDebug() > 0)
  -            digester.log(context.getClass().getName() +
  -                         ".setDistributable( true)");
  +        if (digester.getLogger().isDebugEnabled()) {
  +            digester.getLogger().debug
  +               (context.getClass().getName() + ".setDistributable( true)");
  +        }
       }
   
   }
  @@ -587,14 +590,14 @@
   
   final class SetPublicIdRule extends Rule {
   
  -    public SetPublicIdRule(Digester digester, String method) {
  -        super(digester);
  +    public SetPublicIdRule(String method) {
           this.method = method;
       }
   
       private String method = null;
   
  -    public void begin(Attributes attributes) throws Exception {
  +    public void begin(String namespace, String name, Attributes attributes)
  +        throws Exception {
   
           Context context = (Context) digester.peek(digester.getCount() - 1);
           Object top = digester.peek();
  @@ -607,15 +610,15 @@
           try {
               m = top.getClass().getMethod(method, paramClasses);
           } catch (NoSuchMethodException e) {
  -            digester.log("Can't find method " + method + " in " + top +
  -                         " CLASS " + top.getClass());
  +            digester.getLogger().error("Can't find method " + method + " in "
  +                                       + top + " CLASS " + top.getClass());
               return;
           }
   
           m.invoke(top, paramValues);
  -        if (digester.getDebug() >= 1)
  -            digester.log("" + top.getClass().getName() + "." + method +
  -                        "(" + paramValues[0] + ")");
  +        if (digester.getLogger().isDebugEnabled())
  +            digester.getLogger().debug("" + top.getClass().getName() + "." 
  +                                       + method + "(" + paramValues[0] + ")");
   
       }
   
  @@ -629,23 +632,24 @@
   
   final class WrapperCreateRule extends Rule {
   
  -    public WrapperCreateRule(Digester digester) {
  -        super(digester);
  +    public WrapperCreateRule() {
       }
   
  -    public void begin(Attributes attributes) throws Exception {
  +    public void begin(String namespace, String name, Attributes attributes)
  +        throws Exception {
           Context context =
               (Context) digester.peek(digester.getCount() - 1);
           Wrapper wrapper = context.createWrapper();
           digester.push(wrapper);
  -        if (digester.getDebug() > 0)
  -            digester.log("new " + wrapper.getClass().getName());
  +        if (digester.getLogger().isDebugEnabled())
  +            digester.getLogger().debug("new " + wrapper.getClass().getName());
       }
   
  -    public void end() throws Exception {
  +    public void end(String namespace, String name)
  +        throws Exception {
           Wrapper wrapper = (Wrapper) digester.pop();
  -        if (digester.getDebug() > 0)
  -            digester.log("pop " + wrapper.getClass().getName());
  +        if (digester.getLogger().isDebugEnabled())
  +            digester.getLogger().debug("pop " + wrapper.getClass().getName());
       }
   
   }
  
  
  
  1.5       +14 -15    jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java
  
  Index: ContextRuleSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ContextRuleSet.java	21 Oct 2003 00:18:25 -0000	1.4
  +++ ContextRuleSet.java	25 Jan 2004 20:57:18 -0000	1.5
  @@ -180,8 +180,7 @@
   
           digester.addRule(prefix + "Context/Loader",
                            new CreateLoaderRule
  -                             (digester,
  -                              "org.apache.catalina.loader.WebappLoader",
  +                             ("org.apache.catalina.loader.WebappLoader",
                                 "className"));
           digester.addSetProperties(prefix + "Context/Loader");
           digester.addSetNext(prefix + "Context/Loader",
  @@ -286,10 +285,8 @@
   
   final class CreateLoaderRule extends Rule {
   
  -    public CreateLoaderRule(Digester digester, String loaderClass,
  -                            String attributeName) {
  +    public CreateLoaderRule(String loaderClass, String attributeName) {
   
  -        super(digester);
           this.loaderClass = loaderClass;
           this.attributeName = attributeName;
   
  @@ -299,7 +296,8 @@
   
       private String loaderClass;
   
  -    public void begin(Attributes attributes) throws Exception {
  +    public void begin(String namespace, String name, Attributes attributes)
  +        throws Exception {
   
           // Look up the required parent class loader
           ClassLoader parentClassLoader = null;
  @@ -323,16 +321,17 @@
   
           // Push the new loader onto the stack
           digester.push(loader);
  -        if (digester.getDebug() >= 1)
  -            digester.log("new " + loader.getClass().getName());
  +        if (digester.getLogger().isDebugEnabled())
  +            digester.getLogger().debug("new " + loader.getClass().getName());
   
       }
   
  -    public void end() throws Exception {
  +    public void end(String namespace, String name)
  +        throws Exception {
   
           Loader loader = (Loader) digester.pop();
  -        if (digester.getDebug() >= 1)
  -            digester.log("pop " + loader.getClass().getName());
  +        if (digester.getLogger().isDebugEnabled())
  +            digester.getLogger().debug("pop " + loader.getClass().getName());
   
       }
   
  
  
  
  1.2       +9 -12     jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/CopyParentClassLoaderRule.java
  
  Index: CopyParentClassLoaderRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/CopyParentClassLoaderRule.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CopyParentClassLoaderRule.java	18 Jul 2002 16:47:48 -0000	1.1
  +++ CopyParentClassLoaderRule.java	25 Jan 2004 20:57:18 -0000	1.2
  @@ -65,7 +65,6 @@
   
   import java.lang.reflect.Method;
   import org.apache.catalina.Container;
  -import org.apache.commons.digester.Digester;
   import org.apache.commons.digester.Rule;
   import org.xml.sax.Attributes;
   
  @@ -91,10 +90,7 @@
        *
        * @param digester Digester we are associated with
        */
  -    public CopyParentClassLoaderRule(Digester digester) {
  -
  -        super(digester);
  -
  +    public CopyParentClassLoaderRule() {
       }
   
   
  @@ -108,10 +104,11 @@
        *
        * @exception Exception if a processing error occurs
        */
  -    public void begin(Attributes attributes) throws Exception {
  +    public void begin(String namespace, String name, Attributes attributes)
  +        throws Exception {
   
  -        if (digester.getDebug() >= 1)
  -            digester.log("Copying parent class loader");
  +        if (digester.getLogger().isDebugEnabled())
  +            digester.getLogger().debug("Copying parent class loader");
           Container child = (Container) digester.peek(0);
           Object parent = digester.peek(1);
           Method method =
  
  
  
  1.2       +6 -8      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LifecycleListenerRule.java
  
  Index: LifecycleListenerRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LifecycleListenerRule.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LifecycleListenerRule.java	18 Jul 2002 16:47:50 -0000	1.1
  +++ LifecycleListenerRule.java	25 Jan 2004 20:57:18 -0000	1.2
  @@ -65,7 +65,6 @@
   
   import org.apache.catalina.Lifecycle;
   import org.apache.catalina.LifecycleListener;
  -import org.apache.commons.digester.Digester;
   import org.apache.commons.digester.Rule;
   import org.xml.sax.Attributes;
   
  @@ -91,10 +90,8 @@
        * @param attributeName Name of the attribute that optionally
        *  includes an override name of the LifecycleListener class
        */
  -    public LifecycleListenerRule(Digester digester, String listenerClass,
  -                                 String attributeName) {
  +    public LifecycleListenerRule(String listenerClass, String attributeName) {
   
  -        super(digester);
           this.listenerClass = listenerClass;
           this.attributeName = attributeName;
   
  @@ -127,7 +124,8 @@
        *
        * @exception Exception if a processing error occurs
        */
  -    public void begin(Attributes attributes) throws Exception {
  +    public void begin(String namespace, String name, Attributes attributes)
  +        throws Exception {
   
           // Instantiate a new LifecyleListener implementation object
           String className = listenerClass;
  
  
  
  1.24      +10 -16    jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java
  
  Index: Catalina.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Catalina.java	23 Dec 2003 11:08:32 -0000	1.23
  +++ Catalina.java	25 Jan 2004 20:57:18 -0000	1.24
  @@ -309,8 +309,6 @@
           long t1=System.currentTimeMillis();
           // Initialize the digester
           Digester digester = new CatalinaDigester();
  -        if (debug>0)
  -            digester.setDebug(debug);
           digester.setValidating(false);
           digester.setClassLoader(StandardServer.class.getClassLoader());
   
  @@ -392,8 +390,7 @@
   
           // When the 'engine' is found, set the parentClassLoader.
           digester.addRule("Server/Service/Engine",
  -                         new SetParentClassLoaderRule(digester,
  -                                                      parentClassLoader));
  +                         new SetParentClassLoaderRule(parentClassLoader));
   
           long t2=System.currentTimeMillis();
           log.debug("Digester for server.xml created " + ( t2-t1 ));
  @@ -409,8 +406,6 @@
   
           // Initialize the digester
           Digester digester = new Digester();
  -        if (debug>0)
  -            digester.setDebug(debug);
   
           // Configure the rules we need for shutting down
           digester.addObjectCreate("Server",
  @@ -711,20 +706,19 @@
   
   final class SetParentClassLoaderRule extends Rule {
   
  -    public SetParentClassLoaderRule(Digester digester,
  -                                    ClassLoader parentClassLoader) {
  +    public SetParentClassLoaderRule(ClassLoader parentClassLoader) {
   
  -        super(digester);
           this.parentClassLoader = parentClassLoader;
   
       }
   
       ClassLoader parentClassLoader = null;
   
  -    public void begin(Attributes attributes) throws Exception {
  +    public void begin(String namespace, String name, Attributes attributes)
  +        throws Exception {
   
  -        if (digester.getDebug() >= 1)
  -            digester.log("Setting parent class loader");
  +        if (digester.getLogger().isDebugEnabled())
  +            digester.getLogger().debug("Setting parent class loader");
   
           Container top = (Container) digester.peek();
           top.setParentClassLoader(parentClassLoader);
  
  
  
  1.11      +6 -9      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetDocBaseRule.java
  
  Index: SetDocBaseRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetDocBaseRule.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- SetDocBaseRule.java	11 Jan 2004 10:05:35 -0000	1.10
  +++ SetDocBaseRule.java	25 Jan 2004 20:57:18 -0000	1.11
  @@ -70,7 +70,6 @@
   import org.apache.catalina.Deployer;
   import org.apache.catalina.Host;
   import org.apache.catalina.core.StandardHost;
  -import org.apache.commons.digester.Digester;
   import org.apache.commons.digester.Rule;
   import org.xml.sax.Attributes;
   
  @@ -91,10 +90,7 @@
        *
        * @param digester Digester we are associated with
        */
  -    public SetDocBaseRule(Digester digester) {
  -
  -        super(digester);
  -
  +    public SetDocBaseRule() {
       }
   
   
  @@ -111,7 +107,8 @@
        *
        * @exception Exception if a processing error occurs
        */
  -    public void begin(Attributes attributes) throws Exception {
  +    public void begin(String namespace, String name, Attributes attributes)
  +        throws Exception {
   
           Context child = (Context) digester.peek(0);
           Deployer parent = (Deployer) digester.peek(1);
  
  
  
  1.40      +1 -3      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
  
  Index: ContextConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- ContextConfig.java	20 Dec 2003 23:04:02 -0000	1.39
  +++ ContextConfig.java	25 Jan 2004 20:57:18 -0000	1.40
  @@ -292,7 +292,6 @@
                       InputSource is = new InputSource(url.toExternalForm());
                       is.setByteStream(stream);
                       webDigester.clear();
  -                    webDigester.setDebug(getDebug());
                       if (context instanceof StandardContext) {
                           ((StandardContext) context).setReplaceWelcomeFiles(true);
                       }
  @@ -537,7 +536,6 @@
           synchronized (webDigester) {
               try {
                   source.setByteStream(stream);
  -                webDigester.setDebug(getDebug());
                   
                   if (context instanceof StandardContext)
                       ((StandardContext) context).setReplaceWelcomeFiles(true);
  
  
  
  1.111     +1 -3      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -r1.110 -r1.111
  --- StandardContext.java	23 Jan 2004 23:04:09 -0000	1.110
  +++ StandardContext.java	25 Jan 2004 20:57:18 -0000	1.111
  @@ -130,8 +130,6 @@
   import org.apache.catalina.deploy.SecurityConstraint;
   import org.apache.catalina.loader.WebappLoader;
   import org.apache.catalina.mbeans.MBeanUtils;
  -import org.apache.catalina.session.PersistentManagerBase;
  -import org.apache.catalina.session.StandardManager;
   import org.apache.catalina.startup.ContextConfig;
   import org.apache.catalina.startup.TldConfig;
   import org.apache.catalina.util.CharsetMapper;
  
  
  
  1.15      +4 -6      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java
  
  Index: StandardHostValve.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- StandardHostValve.java	22 Jan 2004 18:21:36 -0000	1.14
  +++ StandardHostValve.java	25 Jan 2004 20:57:18 -0000	1.15
  @@ -80,10 +80,8 @@
   import org.apache.catalina.HttpRequest;
   import org.apache.catalina.HttpResponse;
   import org.apache.catalina.Logger;
  -import org.apache.catalina.Manager;
   import org.apache.catalina.Request;
   import org.apache.catalina.Response;
  -import org.apache.catalina.Session;
   import org.apache.catalina.ValveContext;
   import org.apache.catalina.Wrapper;
   import org.apache.catalina.connector.ClientAbortException;
  
  
  
  1.2       +8 -12     jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/MemoryRuleSet.java
  
  Index: MemoryRuleSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/MemoryRuleSet.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MemoryRuleSet.java	18 Jul 2002 16:47:54 -0000	1.1
  +++ MemoryRuleSet.java	25 Jan 2004 20:57:18 -0000	1.2
  @@ -133,9 +133,7 @@
        */
       public void addRuleInstances(Digester digester) {
   
  -        digester.addRule
  -            (prefix + "user",
  -             new MemoryUserRule(digester));
  +        digester.addRule(prefix + "user", new MemoryUserRule());
   
       }
   
  @@ -154,10 +152,7 @@
        *
        * @param digester The <code>Digester</code> we are associated with.
        */
  -    public MemoryUserRule(Digester digester) {
  -
  -        super(digester);
  -
  +    public MemoryUserRule() {
       }
   
   
  @@ -166,7 +161,8 @@
        *
        * @param attributes The attribute list for this element
        */
  -    public void begin(Attributes attributes) throws Exception {
  +    public void begin(String namespace, String name, Attributes attributes)
  +        throws Exception {
   
           String username = attributes.getValue("name");
           if (username == null) {
  
  
  
  1.3       +6 -6      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/ProcessHelper.java
  
  Index: ProcessHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/ProcessHelper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ProcessHelper.java	2 Sep 2003 21:22:06 -0000	1.2
  +++ ProcessHelper.java	25 Jan 2004 20:57:18 -0000	1.3
  @@ -383,7 +383,7 @@
                               + "]");
                   }
                   try {
  -                    Thread.currentThread().sleep(iClientInputTimeout);
  +                    Thread.sleep(iClientInputTimeout);
                   } catch (InterruptedException ignored) {
                   }
               }
  @@ -478,7 +478,7 @@
                   while ((bufRead = commandsStdOut.read(cBuf)) != -1) {
                       if (servletContainerStdout != null) {
                           if (debug >= 4) {
  -                            log("runCGI: write(\"" + cBuf + "\")");
  +                            log("runCGI: write(\"" + new String(cBuf) + "\")");
                           }
                           servletContainerStdout.write(cBuf, 0, bufRead);
                       }
  @@ -494,7 +494,7 @@
   
               } catch (IllegalThreadStateException e) {
                   try {
  -                    Thread.currentThread().sleep(500);
  +                    Thread.sleep(500);
                   } catch (InterruptedException ignored) {
                   }
               }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message