You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2001/01/26 02:04:25 UTC

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources DirContextURLConnection.java

remm        01/01/25 17:04:25

  Modified:    catalina/src/share/org/apache/naming/resources
                        DirContextURLConnection.java
  Log:
  - Last modified hadling looked broken. It should be fixed (and it should be
    more efficient).
    Thanks to Justyna for reporting (and debugging) the problem.
  
  Revision  Changes    Path
  1.2       +22 -5     jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java
  
  Index: DirContextURLConnection.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DirContextURLConnection.java	2001/01/23 03:41:28	1.1
  +++ DirContextURLConnection.java	2001/01/26 01:04:25	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java,v 1.1 2001/01/23 03:41:28 remm Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/01/23 03:41:28 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java,v 1.2 2001/01/26 01:04:25 remm Exp $
  + * $Revision: 1.2 $
  + * $Date: 2001/01/26 01:04:25 $
    *
    * ====================================================================
    *
  @@ -68,6 +68,7 @@
   import java.io.IOException;
   import java.io.InputStream;
   import java.io.FileNotFoundException;
  +import java.util.Date;
   import javax.naming.NamingException;
   import javax.naming.directory.DirContext;
   import javax.naming.directory.Attribute;
  @@ -84,7 +85,7 @@
    * content is directly returned.
    * 
    * @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   public class DirContextURLConnection 
       extends URLConnection {
  @@ -200,7 +201,23 @@
        * Return the last modified date.
        */
       public long getLastModified() {
  -        return getHeaderFieldDate(ResourceAttributes.LAST_MODIFIED, 0);
  +        if (!connected) {
  +            // Try to connect (silently)
  +            try {
  +                connect();
  +            } catch (IOException e) {
  +            }
  +        }
  +        Attribute lastModified = 
  +            attributes.get(ResourceAttributes.LAST_MODIFIED);
  +        if (lastModified != null) {
  +            try {
  +                Date lmDate = (Date) lastModified.get();
  +                return lmDate.getTime();
  +            } catch (Exception e) {
  +            }
  +        }
  +        return 0;
       }