diff --git a/java/javaBlobstoreApp/src/gaeexample/blobstore/Upload.java b/java/javaBlobstoreApp/src/gaeexample/blobstore/Upload.java
index 1aea1e8d..4a7693bf 100644
--- a/java/javaBlobstoreApp/src/gaeexample/blobstore/Upload.java
+++ b/java/javaBlobstoreApp/src/gaeexample/blobstore/Upload.java
@@ -1,16 +1,15 @@
 package gaeexample.blobstore;
 
-import java.io.IOException;
-import java.util.Map;
+import com.google.appengine.api.blobstore.BlobKey;
+import com.google.appengine.api.blobstore.BlobstoreService;
+import com.google.appengine.api.blobstore.BlobstoreServiceFactory;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import com.google.appengine.api.blobstore.BlobKey;
-import com.google.appengine.api.blobstore.BlobstoreService;
-import com.google.appengine.api.blobstore.BlobstoreServiceFactory;
+import java.io.IOException;
+import java.util.Map;
 
 public class Upload extends HttpServlet {
 
@@ -22,11 +21,14 @@ public void doPost(HttpServletRequest req, HttpServletResponse res) throws Servl
         BlobKey blobKey = blobs.get("myFile");
         BlobKeyCache bc = BlobKeyCache.getBlobKeyCache();
 
+        String contextPath = req.getScheme().toString() + "://" + req.getServerName().toString() + ":" + String.valueOf(req.getServerPort());
+
         if (blobKey == null)
             System.out.println("blobkey is null");
         else {
+            System.out.println("blobkey is " + blobKey.getKeyString());
             bc.add(blobKey);
-            res.sendRedirect("/serve.jsp?blob-key=" + blobKey.getKeyString() + "&fromUpdate=1");
+            res.sendRedirect(res.encodeRedirectURL(contextPath + "/serve.jsp?blob-key=" + blobKey.getKeyString() + "&fromUpdate=1"));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/java/javaBlobstoreApp/war/WEB-INF/appengine-web.xml b/java/javaBlobstoreApp/war/WEB-INF/appengine-web.xml
index 8b8abfc8..2e92b52f 100644
--- a/java/javaBlobstoreApp/war/WEB-INF/appengine-web.xml
+++ b/java/javaBlobstoreApp/war/WEB-INF/appengine-web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
-	<application>simpleBlobstore</application>
+	<application>javaBlobstoreApp</application>
 	<version>1</version>
         <threadsafe>true</threadsafe>
 	
diff --git a/java/javaBlobstoreApp/war/WEB-INF/classes/gaeexample/blobstore/BlobKeyCache.class b/java/javaBlobstoreApp/war/WEB-INF/classes/gaeexample/blobstore/BlobKeyCache.class
index c9e7cbe5..0e6e53c2 100644
Binary files a/java/javaBlobstoreApp/war/WEB-INF/classes/gaeexample/blobstore/BlobKeyCache.class and b/java/javaBlobstoreApp/war/WEB-INF/classes/gaeexample/blobstore/BlobKeyCache.class differ
diff --git a/java/javaBlobstoreApp/war/WEB-INF/classes/gaeexample/blobstore/Delete.class b/java/javaBlobstoreApp/war/WEB-INF/classes/gaeexample/blobstore/Delete.class
index 5e683fb1..29fb38e3 100644
Binary files a/java/javaBlobstoreApp/war/WEB-INF/classes/gaeexample/blobstore/Delete.class and b/java/javaBlobstoreApp/war/WEB-INF/classes/gaeexample/blobstore/Delete.class differ
diff --git a/java/javaBlobstoreApp/war/WEB-INF/classes/gaeexample/blobstore/Serve.class b/java/javaBlobstoreApp/war/WEB-INF/classes/gaeexample/blobstore/Serve.class
index 27b6fce4..0d31d908 100644
Binary files a/java/javaBlobstoreApp/war/WEB-INF/classes/gaeexample/blobstore/Serve.class and b/java/javaBlobstoreApp/war/WEB-INF/classes/gaeexample/blobstore/Serve.class differ
diff --git a/java/javaBlobstoreApp/war/WEB-INF/classes/gaeexample/blobstore/Upload.class b/java/javaBlobstoreApp/war/WEB-INF/classes/gaeexample/blobstore/Upload.class
index ad30c256..f03167c5 100644
Binary files a/java/javaBlobstoreApp/war/WEB-INF/classes/gaeexample/blobstore/Upload.class and b/java/javaBlobstoreApp/war/WEB-INF/classes/gaeexample/blobstore/Upload.class differ