svn commit: r703919 - /felix/trunk/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java

[wa...@apache.org]

Author: walkerr
Date: Sun Oct 12 23:04:01 2008
New Revision: 703919

URL: http://svn.apache.org/viewvc?rev=703919&view=rev
Log:
FELIX-407 - include and process modification timesstamps

Modified:
    felix/trunk/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java

Modified: felix/trunk/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java
URL: http://svn.apache.org/viewvc/felix/trunk/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java?rev=703919&r1=703918&r2=703919&view=diff
==============================================================================
--- felix/trunk/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java (original)
+++ felix/trunk/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java Sun Oct 12 23:04:01 2008
@@ -22,7 +22,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.File;
 import java.net.URL;
+import java.net.URLConnection;
 import java.security.AccessControlContext;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
@@ -152,35 +154,47 @@
         // errors if not included
         response.setContentType( encoding );
 
-        //TODO: check other http fields e.g. ranges, timestamps etc.
+        long lastModified  = getLastModified(url);
+        
+        if (lastModified != 0)
+        {
+            response.setDateHeader("Last-Modified", lastModified);
+        }
 
-        // make sure we access the resource inside the bundle's access control
-        // context if supplied
-        if ( m_acc != null )
+        if (!resourceModified(lastModified, request.getDateHeader("If-Modified-Since")))
         {
-            try
+            response.setStatus(response.SC_NOT_MODIFIED);
+        }
+        else
+        {
+            // make sure we access the resource inside the bundle's access control
+            // context if supplied
+            if ( m_acc != null )
             {
-                AccessController.doPrivileged( new PrivilegedExceptionAction()
+                try
                 {
-                    public Object run() throws Exception
+                    AccessController.doPrivileged( new PrivilegedExceptionAction()
                     {
-                        copyResourceBytes( url, response );
-                        return null;
-                    }
-                }, m_acc );
+                        public Object run() throws Exception
+                        {
+                            copyResourceBytes( url, response );
+                            return null;
+                        }
+                    }, m_acc );
+                }
+                catch ( PrivilegedActionException ex )
+                {
+                    IOException ioe = ( IOException ) ex.getException();
+                    throw ioe;
+                }
             }
-            catch ( PrivilegedActionException ex )
+            else
             {
-                IOException ioe = ( IOException ) ex.getException();
-                throw ioe;
+                copyResourceBytes( url, response );
             }
+            
+            //TODO: set other http fields e.g. __LastModified, __ContentLength
         }
-        else
-        {
-            copyResourceBytes( url, response );
-        }
-
-        //TODO: set other http fields e.g. __LastModified, __ContentLength
     }
 
 
@@ -239,5 +253,66 @@
     public void doStop()
     {
     }
+    
+    
+    /**
+     * Gets the last modified value for file modification detection.
+     * Aids in "conditional get" and intermediate proxy/node cacheing.
+     *
+     * Approach used follows that used by Sun for JNLP handling to workaround an 
+     * apparent issue where file URLs do not correctly return a last modified time.
+     * 
+     */
+    protected long getLastModified (URL resUrl)
+    {
+        long lastModified = 0;
+        
+        try 
+        {
+            // Get last modified time
+            URLConnection conn = resUrl.openConnection();
+            lastModified = conn.getLastModified();
+        } 
+        catch (Exception e) 
+        {
+            // do nothing
+        }
 
+        if (lastModified == 0) 
+        {
+            // Arguably a bug in the JRE will not set the lastModified for file URLs, and
+            // always return 0. This is a workaround for that problem.
+            String filepath = resUrl.getPath();
+            
+            if (filepath != null) 
+            {
+                File f = new File(filepath);
+                if (f.exists()) 
+                {
+                    lastModified = f.lastModified();
+                }
+            }
+        }
+        
+        return lastModified;
+    }
+    
+    
+    protected boolean resourceModified(long resTimestamp, long modSince)
+    {
+        boolean retval = false;
+        
+        // Have to normalise timestamps as HTTP times have last 3 digits as zero
+        modSince /= 1000;
+        resTimestamp /= 1000;
+        
+        // Timestamp check to see if modified
+        if (modSince == -1 || resTimestamp > modSince)
+        {
+            retval = true;
+        }
+        
+        return retval;
+    }
+    
 }