tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util ThreadPool.java
Date Sun, 27 Feb 2000 02:01:25 GMT
rubys       00/02/26 18:01:25

  Modified:    src/share/org/apache/jasper CommandLineContext.java
                        JspEngineContext.java
               src/share/org/apache/tomcat/request SecurityCheck.java
               src/share/org/apache/tomcat/util ThreadPool.java
  Log:
  Fix Tomcat so that it can pass Jikes more strict compilation checks
  
  Revision  Changes    Path
  1.3       +4 -4      jakarta-tomcat/src/share/org/apache/jasper/CommandLineContext.java
  
  Index: CommandLineContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/CommandLineContext.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CommandLineContext.java	2000/02/09 06:50:47	1.2
  +++ CommandLineContext.java	2000/02/27 02:01:23	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/CommandLineContext.java,v
1.2 2000/02/09 06:50:47 shemnon Exp $
  - * $Revision: 1.2 $
  - * $Date: 2000/02/09 06:50:47 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/CommandLineContext.java,v
1.3 2000/02/27 02:01:23 rubys Exp $
  + * $Revision: 1.3 $
  + * $Date: 2000/02/27 02:01:23 $
    *
    * ====================================================================
    * 
  @@ -329,7 +329,7 @@
               return uri;
           } else {
               return uriBase + uri;
  -        };
  +        }
       };
   
   
  
  
  
  1.7       +5 -5      jakarta-tomcat/src/share/org/apache/jasper/JspEngineContext.java
  
  Index: JspEngineContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspEngineContext.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JspEngineContext.java	2000/02/13 06:25:23	1.6
  +++ JspEngineContext.java	2000/02/27 02:01:23	1.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspEngineContext.java,v
1.6 2000/02/13 06:25:23 akv Exp $
  - * $Revision: 1.6 $
  - * $Date: 2000/02/13 06:25:23 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspEngineContext.java,v
1.7 2000/02/27 02:01:23 rubys Exp $
  + * $Revision: 1.7 $
  + * $Date: 2000/02/27 02:01:23 $
    *
    * ====================================================================
    * 
  @@ -329,7 +329,7 @@
               String actURI =  req.getServletPath();
               String baseURI = actURI.substring(0, actURI.lastIndexOf('/'));
               return baseURI + '/' + uri;
  -       };
  +        }
       };    
   
       /**
  @@ -356,7 +356,7 @@
           else
           {
               return path;
  -        };
  +        }
       };
   
      
  
  
  
  1.7       +4 -4      jakarta-tomcat/src/share/org/apache/tomcat/request/SecurityCheck.java
  
  Index: SecurityCheck.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/SecurityCheck.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SecurityCheck.java	2000/02/22 21:06:43	1.6
  +++ SecurityCheck.java	2000/02/27 02:01:24	1.7
  @@ -331,10 +331,10 @@
   	// call addUser using attributes as parameters 
   	xh.addRule("tomcat-users/user",
   		   new XmlAction() {
  -			   public void start( SaxContext ctx) throws Exception {
  -			       int top=ctx.getTagCount()-1;
  -			       MemoryRealm mr=(MemoryRealm)ctx.getRoot();
  -			       AttributeList attributes = ctx.getAttributeList( top );
  +			   public void start(SaxContext sctx) throws Exception {
  +			       int top=sctx.getTagCount()-1;
  +			       MemoryRealm mr=(MemoryRealm)sctx.getRoot();
  +			       AttributeList attributes = sctx.getAttributeList( top );
   			       String user=attributes.getValue("name");
   			       String pass=attributes.getValue("password");
   			       String group=attributes.getValue("roles");
  
  
  
  1.3       +5 -5      jakarta-tomcat/src/share/org/apache/tomcat/util/ThreadPool.java
  
  Index: ThreadPool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/ThreadPool.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ThreadPool.java	2000/02/22 21:06:47	1.2
  +++ ThreadPool.java	2000/02/27 02:01:24	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/ThreadPool.java,v
1.2 2000/02/22 21:06:47 costin Exp $
  - * $Revision: 1.2 $
  - * $Date: 2000/02/22 21:06:47 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/ThreadPool.java,v
1.3 2000/02/27 02:01:24 rubys Exp $
  + * $Revision: 1.3 $
  + * $Date: 2000/02/27 02:01:24 $
    *
    * ====================================================================
    *
  @@ -263,7 +263,7 @@
                       boolean checkSpare = false;
                       synchronized(this) {
                           if(!shouldRun && !shouldTerminate) {
  -                            wait(WORK_WAIT_TIMEOUT);
  +                            this.wait(WORK_WAIT_TIMEOUT);
                           }
                           if(!shouldRun && !shouldTerminate) {
                               checkSpare = true;
  @@ -298,7 +298,7 @@
           public synchronized void runIt(Runnable toRun) {
               this.toRun = toRun;
               shouldRun = true;
  -            notify();
  +            this.notify();
           }
   
           public synchronized void terminate() {
  
  
  

Mime
View raw message