Merge pull request sakaiproject#1309 from jonespm/SAK-29622

SAK-29622 - Pictures not showing after uploading with Profile tool (g…

Author: ern

profile2/tool/src/java/org/sakaiproject/profile2/tool/components/GalleryImageRenderer.java

@@ -20,6 +20,7 @@
 import org.apache.wicket.markup.html.image.resource.BufferedDynamicImageResource;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.request.resource.IResource;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.sakaiproject.profile2.logic.SakaiProxy;
 import org.sakaiproject.profile2.util.ProfileConstants;
@@ -57,8 +58,8 @@ else if (sakaiProxy.getResource(imageResourceId) == null) {
 			BufferedDynamicImageResource imageResource = new BufferedDynamicImageResource() {
 
 				private static final long serialVersionUID = 1L;
-
-				protected byte[] getImageData() {
+				@Override
+				protected byte[] getImageData(IResource.Attributes ignored) {
 					return imageBytes;
 				}
 			};

profile2/tool/src/java/org/sakaiproject/profile2/tool/components/ProfileImage.java

@@ -4,6 +4,7 @@
 import org.apache.wicket.markup.html.WebComponent;
 import org.apache.wicket.model.IModel;
 import org.sakaiproject.profile2.util.ProfileConstants;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Renders a user's profile image via the direct entity URL. 
@@ -57,7 +58,8 @@ protected void onComponentTag(ComponentTag tag) {
 			}
 		}
 
-		String url = "/direct/profile/"+userUuid + "/image" + sizePart;
+		//Cache for a minute
+		String url = "/direct/profile/"+userUuid + "/image" + sizePart + "?t=" + TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis());
 
 		tag.put("src", url);
 	}