svn commit: r991702 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java

[pe...@apache.org]

Author: pete
Date: Wed Sep  1 20:54:11 2010
New Revision: 991702

URL: http://svn.apache.org/viewvc?rev=991702&view=rev
Log:
add Last-Modified header to response (if available)

Modified:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java?rev=991702&r1=991701&r2=991702&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java Wed Sep  1 20:54:11 2010
@@ -29,6 +29,7 @@ import org.apache.wicket.util.lang.Packa
 import org.apache.wicket.util.lang.WicketObjects;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
+import org.apache.wicket.util.time.Time;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -48,7 +49,7 @@ public class PackageResource extends Abs
 		/**
 		 * Construct.
 		 *
-		 * @param message
+		 * @param message error message
 		 */
 		public PackageResourceBlockedException(String message)
 		{
@@ -180,6 +181,11 @@ public class PackageResource extends Abs
 			IResourceStream resourceStream = getResourceStream();
 			resourceResponse.setContentType(resourceStream.getContentType());
 
+			final Time lastModified = resourceStream.lastModifiedTime();
+			
+			if(lastModified != null)
+				resourceResponse.setLastModified(lastModified.toDate());
+
 			if (resourceStream == null)
 				return sendResourceError(resourceResponse, HttpServletResponse.SC_NOT_FOUND, "Unable to find resource");
 
@@ -223,10 +229,10 @@ public class PackageResource extends Abs
 	/**
 	 * send resource specific error message and write log entry
 	 *
-	 * @param resourceResponse resource response for method chaining
+	 * @param resourceResponse resource response
 	 * @param errorCode error code (=http status)
 	 * @param errorMessage error message (=http error message)
-	 * @return
+	 * @return resource response for method chaining
 	 */
 	private ResourceResponse sendResourceError(ResourceResponse resourceResponse, int errorCode, String errorMessage)
 	{
@@ -254,9 +260,9 @@ public class PackageResource extends Abs
 	}
 
 	/**
-	 * @param scope
-	 * @param path
-	 * @return
+	 * @param scope resource scope
+	 * @param path  resource path
+	 * @return <code>true<code> if resource access is granted
 	 */
 	private boolean accept(Class<?> scope, String path)
 	{