--- ImageServlet.java.ori	2004-11-16 04:04:36.000000000 -0300
+++ ImageServlet.java	2004-11-17 10:11:47.125000000 -0300
@@ -14,6 +14,7 @@
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -33,8 +34,17 @@
                         "Image temp directory " + imageDir + " not found");
                 return;
         }
-        
-        String imageName = req.getParameter("image");
+
+				//maybe using getSession(false) would fit better
+				HttpSession session = req.getSession();
+
+				String useSession = req.getParameter("useSession");
+
+				String imageName = req.getParameter("image");
+
+        if(useSession != null && useSession.equalsIgnoreCase("true")) {
+        	imageName = (String)session.getAttribute("org.apache.taglibs.image.ImageName");
+        }
 
         File image = new File(imageDir, imageName);
         if (image == null || !image.exists() || !image.isFile()) {