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-jasper/jasper2/src/share/org/apache/jasper/runtime BodyContentImpl.java
Date Thu, 01 Jul 2004 09:44:27 GMT
remm        2004/07/01 02:44:27

  Modified:    modules/cluster/src/share/org/apache/catalina/cluster/mcast
                        McastMembership.java McastServiceImpl.java
                        McastMember.java McastService.java
               modules/cluster/src/share/org/apache/catalina/cluster/session
                        DeltaManager.java SerializablePrincipal.java
                        ReplicatedSession.java DeltaSession.java
                        SimpleTcpReplicationManager.java DeltaRequest.java
               modules/cluster/src/share/org/apache/catalina/cluster
                        SessionMessage.java
               modules/cluster/src/share/org/apache/catalina/cluster/io
                        Jdk13ObjectReader.java XByteBuffer.java
                        ObjectReader.java
               modules/cluster/src/share/org/apache/catalina/cluster/deploy
                        FileMessage.java
               jasper2/src/share/org/apache/jasper/compiler Compiler.java
               modules/cluster/src/share/org/apache/catalina/cluster/tcp
                        AsyncSocketSender.java
               jasper2/src/share/org/apache/jasper/runtime
                        BodyContentImpl.java
  Log:
  - Clean up some warnings.
  
  Revision  Changes    Path
  1.6       +1 -2      jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastMembership.java
  
  Index: McastMembership.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastMembership.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- McastMembership.java	26 May 2004 16:35:59 -0000	1.5
  +++ McastMembership.java	1 Jul 2004 09:44:26 -0000	1.6
  @@ -18,7 +18,6 @@
   
   
   import java.util.HashMap;
  -import java.util.Iterator;
   /**
    * A <b>membership</b> implementation using simple multicast.
    * This is the representation of a multicast membership.
  
  
  
  1.12      +2 -2      jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
  
  Index: McastServiceImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- McastServiceImpl.java	14 May 2004 15:00:29 -0000	1.11
  +++ McastServiceImpl.java	1 Jul 2004 09:44:26 -0000	1.12
  @@ -257,7 +257,7 @@
               while ( doRun ) {
                   try {
                       send();
  -                    this.sleep(time);
  +                    Thread.sleep(time);
                   } catch ( Exception x ) {
                       log.warn("Unable to send mcast message.",x);
                   }
  
  
  
  1.6       +4 -4      jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastMember.java
  
  Index: McastMember.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastMember.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- McastMember.java	26 May 2004 16:35:54 -0000	1.5
  +++ McastMember.java	1 Jul 2004 09:44:26 -0000	1.6
  @@ -93,9 +93,9 @@
        */
       public java.util.HashMap getMemberProperties() {
           java.util.HashMap map = new java.util.HashMap(2);
  -        map.put(this.TCP_LISTEN_HOST,this.host);
  -        map.put(this.TCP_LISTEN_PORT,String.valueOf(this.port));
  -        map.put(this.MEMBER_NAME,name);
  +        map.put(McastMember.TCP_LISTEN_HOST,this.host);
  +        map.put(McastMember.TCP_LISTEN_PORT,String.valueOf(this.port));
  +        map.put(McastMember.MEMBER_NAME,name);
           return map;
       }
   
  
  
  
  1.12      +3 -4      jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastService.java
  
  Index: McastService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastService.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- McastService.java	26 May 2004 16:36:03 -0000	1.11
  +++ McastService.java	1 Jul 2004 09:44:26 -0000	1.12
  @@ -20,7 +20,6 @@
   import java.util.Properties;
   import org.apache.catalina.cluster.Member;
   import org.apache.catalina.cluster.MembershipListener;
  -import java.util.Properties;
   
   /**
    * A <b>membership</b> implementation using simple multicast.
  @@ -197,7 +196,7 @@
   
           impl.start(level);
           log.info("Sleeping for "+(Long.parseLong(properties.getProperty("msgFrequency"))*4)+"
secs to establish cluster membership");
  -        Thread.currentThread().sleep((Long.parseLong(properties.getProperty("msgFrequency"))*4));
  +        Thread.sleep((Long.parseLong(properties.getProperty("msgFrequency"))*4));
   
       }
   
  @@ -266,7 +265,7 @@
           p.setProperty("tcpListenHost",args[0]);
           service.setProperties(p);
           service.start();
  -        Thread.currentThread().sleep(60*1000*60);
  +        Thread.sleep(60*1000*60);
       }
       public int getMcastSoTimeout() {
           return mcastSoTimeout;
  
  
  
  1.28      +3 -8      jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- DeltaManager.java	4 Jun 2004 20:22:27 -0000	1.27
  +++ DeltaManager.java	1 Jul 2004 09:44:26 -0000	1.28
  @@ -26,15 +26,10 @@
   import java.io.IOException;
   import java.io.ObjectInputStream;
   import java.io.ObjectOutputStream;
  -import java.security.AccessController;
  -import java.security.PrivilegedActionException;
  -import java.security.PrivilegedExceptionAction;
   import java.util.ArrayList;
   import java.util.Iterator;
  -import javax.servlet.ServletContext;
   import org.apache.catalina.Container;
   import org.apache.catalina.Context;
  -import org.apache.catalina.Globals;
   import org.apache.catalina.Lifecycle;
   import org.apache.catalina.LifecycleException;
   import org.apache.catalina.LifecycleListener;
  @@ -174,7 +169,7 @@
        */
       public String getInfo() {
   
  -        return (this.info);
  +        return (info);
   
       }
   
  @@ -654,7 +649,7 @@
                   boolean isTimeout=false;
                   do {
                       try {
  -                        Thread.currentThread().sleep(100);
  +                        Thread.sleep(100);
                       }catch ( Exception sleep) {}
                       reqNow = System.currentTimeMillis();
                       isTimeout=((reqNow-reqStart)>(1000*60));
  
  
  
  1.4       +1 -2      jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java
  
  Index: SerializablePrincipal.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SerializablePrincipal.java	27 Feb 2004 14:58:56 -0000	1.3
  +++ SerializablePrincipal.java	1 Jul 2004 09:44:26 -0000	1.4
  @@ -18,7 +18,6 @@
   package org.apache.catalina.cluster.session;
   
   
  -import java.security.Principal;
   import java.util.Arrays;
   import java.util.List;
   import org.apache.catalina.Realm;
  
  
  
  1.15      +0 -5      jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/ReplicatedSession.java
  
  Index: ReplicatedSession.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/ReplicatedSession.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ReplicatedSession.java	28 May 2004 18:49:37 -0000	1.14
  +++ ReplicatedSession.java	1 Jul 2004 09:44:26 -0000	1.15
  @@ -41,15 +41,10 @@
    *
    */
   import org.apache.catalina.Manager;
  -import org.apache.catalina.session.ManagerBase;
  -import org.apache.catalina.realm.GenericPrincipal;
  -import org.apache.catalina.SessionListener;
   import java.io.IOException;
   import java.io.ObjectInputStream;
   import java.io.ObjectOutputStream;
   import java.security.Principal;
  -import java.io.PrintWriter;
  -import java.io.StringWriter;
   
   public class ReplicatedSession extends org.apache.catalina.session.StandardSession
   implements org.apache.catalina.cluster.ClusterSession{
  
  
  
  1.26      +2 -4      jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
  
  Index: DeltaSession.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- DeltaSession.java	23 Jun 2004 16:59:41 -0000	1.25
  +++ DeltaSession.java	1 Jul 2004 09:44:26 -0000	1.26
  @@ -36,7 +36,6 @@
   
   import javax.servlet.ServletContext;
   import javax.servlet.http.HttpSession;
  -import javax.servlet.http.HttpSessionActivationListener;
   import javax.servlet.http.HttpSessionAttributeListener;
   import javax.servlet.http.HttpSessionBindingEvent;
   import javax.servlet.http.HttpSessionBindingListener;
  @@ -52,7 +51,6 @@
   import org.apache.catalina.util.Enumerator;
   import org.apache.catalina.util.StringManager;
   
  -import org.apache.catalina.session.ManagerBase;
   import org.apache.catalina.session.Constants;
   import org.apache.catalina.cluster.ClusterSession;
   import org.apache.catalina.realm.GenericPrincipal;
  @@ -440,7 +438,7 @@
        */
       public String getInfo() {
   
  -        return (this.info);
  +        return (info);
   
       }
   
  
  
  
  1.30      +7 -15     jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
  
  Index: SimpleTcpReplicationManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- SimpleTcpReplicationManager.java	4 Jun 2004 20:22:27 -0000	1.29
  +++ SimpleTcpReplicationManager.java	1 Jul 2004 09:44:26 -0000	1.30
  @@ -15,23 +15,15 @@
    */
   package org.apache.catalina.cluster.session;
   
  -import java.io.*;
  -import org.apache.catalina.Session;
  -import org.apache.catalina.realm.GenericPrincipal;
  +import java.io.IOException;
  +
   import org.apache.catalina.LifecycleException;
  -import org.apache.catalina.util.CustomObjectInputStream;
  -import org.apache.catalina.cluster.io.ListenCallback;
  -import org.apache.catalina.cluster.tcp.ReplicationListener;
  -import org.apache.catalina.cluster.tcp.ReplicationTransmitter;
  -import org.apache.catalina.cluster.tcp.IDataSender;
  -import org.apache.catalina.cluster.tcp.SocketSender;
  -import org.apache.catalina.cluster.Member;
  +import org.apache.catalina.Session;
   import org.apache.catalina.cluster.CatalinaCluster;
  +import org.apache.catalina.cluster.Member;
   import org.apache.catalina.cluster.SessionMessage;
  +import org.apache.catalina.realm.GenericPrincipal;
   
  -
  -
  -import java.net.InetAddress;
   /**
    * Title:        Tomcat Session Replication for Tomcat 4.0 <BR>
    * Description:  A very simple straight forward implementation of
  @@ -135,7 +127,7 @@
       }
   
       public void setCluster(CatalinaCluster cluster) {
  -        this.log.debug("Cluster associated with SimpleTcpReplicationManager");
  +        log.debug("Cluster associated with SimpleTcpReplicationManager");
           this.cluster = cluster;
       }
   
  @@ -448,7 +440,7 @@
                   boolean isTimeout=false;
                   do {
                       try {
  -                        Thread.currentThread().sleep(100);
  +                        Thread.sleep(100);
                       }catch ( Exception sleep) {}
                       reqNow = System.currentTimeMillis();
                       isTimeout=((reqNow-reqStart)>(1000*60));
  
  
  
  1.8       +0 -2      jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaRequest.java
  
  Index: DeltaRequest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaRequest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DeltaRequest.java	27 Feb 2004 14:58:56 -0000	1.7
  +++ DeltaRequest.java	1 Jul 2004 09:44:26 -0000	1.8
  @@ -27,11 +27,9 @@
    */
   
   import java.util.LinkedList;
  -import javax.servlet.http.HttpSession;
   import java.io.Externalizable;
   import java.security.Principal;
   import org.apache.catalina.realm.GenericPrincipal;
  -import org.apache.catalina.cluster.ClusterSession;
   
   
   public class DeltaRequest implements Externalizable {
  
  
  
  1.11      +1 -2      jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/SessionMessage.java
  
  Index: SessionMessage.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/SessionMessage.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- SessionMessage.java	29 May 2004 02:36:12 -0000	1.10
  +++ SessionMessage.java	1 Jul 2004 09:44:26 -0000	1.11
  @@ -36,8 +36,7 @@
    * </ul>
    *
    */
  - import java.security.Principal;
  - import org.apache.catalina.cluster.Member;
  +
   public interface SessionMessage extends ClusterMessage, java.io.Serializable
   {
   
  
  
  
  1.4       +1 -3      jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/io/Jdk13ObjectReader.java
  
  Index: Jdk13ObjectReader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/io/Jdk13ObjectReader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Jdk13ObjectReader.java	27 Feb 2004 14:58:55 -0000	1.3
  +++ Jdk13ObjectReader.java	1 Jul 2004 09:44:27 -0000	1.4
  @@ -30,8 +30,6 @@
    */
   
   import java.net.Socket;
  -import java.nio.ByteBuffer;
  -import java.io.IOException;
   import org.apache.catalina.cluster.io.XByteBuffer;
   public class Jdk13ObjectReader
   {
  
  
  
  1.9       +2 -2      jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/io/XByteBuffer.java
  
  Index: XByteBuffer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/io/XByteBuffer.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- XByteBuffer.java	26 May 2004 16:32:59 -0000	1.8
  +++ XByteBuffer.java	1 Jul 2004 09:44:27 -0000	1.9
  @@ -144,7 +144,7 @@
   
           while ( start < bufSize ) {
               //first check start header
  -            int index = this.firstIndexOf(buf,start,START_DATA);
  +            int index = XByteBuffer.firstIndexOf(buf,start,START_DATA);
               //if the header (START_DATA) isn't the first thing or
               //the buffer isn't even 10 bytes
               if ( index != start || ((bufSize-start)<10) ) break;
  
  
  
  1.6       +1 -2      jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/io/ObjectReader.java
  
  Index: ObjectReader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/io/ObjectReader.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ObjectReader.java	27 Feb 2004 14:58:55 -0000	1.5
  +++ ObjectReader.java	1 Jul 2004 09:44:27 -0000	1.6
  @@ -32,7 +32,6 @@
   import java.nio.channels.SocketChannel;
   import java.nio.channels.Selector;
   import java.nio.ByteBuffer;
  -import java.io.IOException;
   import org.apache.catalina.cluster.io.XByteBuffer;
   public class ObjectReader
   {
  
  
  
  1.2       +0 -4      jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FileMessage.java
  
  Index: FileMessage.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FileMessage.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FileMessage.java	4 Jun 2004 20:22:27 -0000	1.1
  +++ FileMessage.java	1 Jul 2004 09:44:27 -0000	1.2
  @@ -18,11 +18,7 @@
   
   import org.apache.catalina.cluster.ClusterMessage;
   import org.apache.catalina.cluster.Member;
  -import java.io.Externalizable;
   import java.io.Serializable;
  -import java.io.IOException;
  -import java.io.ObjectOutput;
  -import java.io.ObjectInput;
   
   /**
    * Contains the data for a file being transferred over TCP, this is 
  
  
  
  1.89      +1 -1      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java
  
  Index: Compiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -u -r1.88 -r1.89
  --- Compiler.java	15 Jun 2004 21:30:35 -0000	1.88
  +++ Compiler.java	1 Jul 2004 09:44:27 -0000	1.89
  @@ -406,7 +406,7 @@
               String errorReportString = errorReport.toString();
               log.error("Error compiling file: " + javaFileName + " "
                         + errorReportString);
  -            JavacErrorDetail[] javacErrors = errDispatcher.parseJavacErrors(
  +            JavacErrorDetail[] javacErrors = ErrorDispatcher.parseJavacErrors(
                           errorReportString, javaFileName, pageNodes);
               if (javacErrors != null) {
                   errDispatcher.javacError(javacErrors);
  
  
  
  1.7       +0 -1      jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/AsyncSocketSender.java
  
  Index: AsyncSocketSender.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/AsyncSocketSender.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AsyncSocketSender.java	7 Apr 2004 20:43:55 -0000	1.6
  +++ AsyncSocketSender.java	1 Jul 2004 09:44:27 -0000	1.7
  @@ -18,7 +18,6 @@
   
   import java.net.InetAddress ;
   import java.net.Socket;
  -import java.io.IOException;
   import org.apache.catalina.cluster.util.SmartQueue;
   public class AsyncSocketSender implements IDataSender {
       private static int threadCounter=1;
  
  
  
  1.13      +0 -1      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/BodyContentImpl.java
  
  Index: BodyContentImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/BodyContentImpl.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- BodyContentImpl.java	6 Apr 2004 23:05:39 -0000	1.12
  +++ BodyContentImpl.java	1 Jul 2004 09:44:27 -0000	1.13
  @@ -18,7 +18,6 @@
   
   import java.io.CharArrayReader;
   import java.io.IOException;
  -import java.io.PrintWriter;
   import java.io.Reader;
   import java.io.Writer;
   
  
  
  

---------------------------------------------------------------------
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