From c94f4d51deff991f3547bbc9ffa38b92e30cd167 Mon Sep 17 00:00:00 2001
From: menivaitsi <melpomeni.vaitsi@appscale.com>
Date: Thu, 2 Apr 2015 14:28:28 -0700
Subject: [PATCH] Fixed redirection that was breaking the confirmation flow of
 the app.

---
 .../src/gaeexample/blobstore/Upload.java      |  18 ++++++++++--------
 .../war/WEB-INF/appengine-web.xml             |   2 +-
 .../gaeexample/blobstore/BlobKeyCache.class   | Bin 2280 -> 2280 bytes
 .../classes/gaeexample/blobstore/Delete.class | Bin 1917 -> 1917 bytes
 .../classes/gaeexample/blobstore/Serve.class  | Bin 1483 -> 1483 bytes
 .../classes/gaeexample/blobstore/Upload.class | Bin 2242 -> 2721 bytes
 6 files changed, 11 insertions(+), 9 deletions(-)

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 c9e7cbe55339ca4253e5525c35c79e40b2c14cd9..0e6e53c2d8c87879a1ef862c11417f95bfb72663 100644
GIT binary patch
delta 17
ZcmaDM_(G85)W2Q(7#J9gH*!4S002jB2M+)M

delta 17
ZcmaDM_(G85)W2Q(7#J9gHgY`R002j62Mz!L

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 5e683fb148b74ec520f2fa80fdeb09b4baea241e..29fb38e3d07ef97ed57d76da75a6e72bdd0d6898 100644
GIT binary patch
delta 17
Zcmey%_m_|3)W2Q(7#J9gH*%D+0{}?f2FCyZ

delta 17
Zcmey%_m_|3)W2Q(7#J9gHgc4*0{}?a2F3sY

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 27b6fce4ebef017ce318c9d5eda873383bbe5931..0d31d90833e51ef4992c8c386a90eed18b7e1f87 100644
GIT binary patch
delta 17
ZcmX@jeVUu&)W2Q(7#J9gH*y?i1pq?b2B`o5

delta 17
ZcmX@jeVUu&)W2Q(7#J9gHgX(h1pq?W2B-i4

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 ad30c256a8c9a67df6cfc3d4fe502fcf052c7ad4..f03167c5bcfe6217290c78af5d21d4e7047d898e 100644
GIT binary patch
delta 1129
zcmZXT+f!Rr6vlr$NzYDBHWVVX4Hyd+B55fRFRi6wy@ADIi%@8*^%9Z;gyw?D0YNMA
zQm?fto>yP`<cp(II};n7>4PuM_^&wQgRh-Y*D+WfeOY_$Z++`qd#%0qkL_1GYd`<~
z{Y~J0Je$3Y+dReb2zN0N<!MfYnT+xbCpD*Rrg&B}Z4+TU$_%G%W|{N1XTqHIk#k|5
z^VjG7$az097vTk74D*uB%VfgL+i0@BR4$AYW}z+0B1^u>YnC+^t}XqldZO8K$#vG<
zsf@d%h)phM)-vfrrnH!zaVz=KqBj%RObWZ8DQZe`I!#%#qOix-v(Ac}FPEyCS2Pvx
zmp~$QH~TbIgUhO+hhEK^;Z@cZR&irIUvNaku)%BIa4>C^4X<<2yAtfGNeROnY>Kv_
z#-`y--ckfd(rLrnY%0`<;T<j+-sL^b`-TtrP_c8qP@ccwZ1m)-J*Cxxobw~YWj<C!
z{}nM@@g+auQ$<I*>QvU8q2=nzF`sf!vPXLqEy;ySxj4I$%ec<yu=H#Aj4i|GzF7Cx
zt!^(E+Nb)xn(7ZKlHNBe>Gg#UwYU9uX4lV#t}8pT=(sc4C8y|kzgd0WSJsiS79a9!
zS59V%j#Rw8pDI^eX?7qrq0noY!m4v>LD4xdk^29QgssAEBbg_hjpiLmVkVbUqzAmM
zz+gNzr)YOd*>cXAc5?ZOlXYjOC;b!Gt^T2-3R87TxxYj7$`jlx?@|%)FHF3E_;Qb8
z`@ChHINUFoEhw}SqK%|@MxwsGhXGj?DfSDaPuz>b(SkL+n>tbZfylY<un#ndD(aXz
zEwNTH0_?mEv^9Zt#SLQO*STZFiidup^;<e(oppA7$!T%7#bUdK6A#td)8tA#zQf<g
z2M4z)aZ5t6u6pesVywH#Zg6LS28jUI<dh-&?)FQ6&_R?=_OOeD*fVr-o^JUs2`<Tu
zF3Xf|$b9_nk2gEq?p}K30E2%`q`^UkWD-%nCe6KNf+BU5VeXSs3BHi;{{TBge4Yn6
zgvDWz^M~0?cu4q11nDL4hg8;@5zSG}!<tdeBbsBHN8y%y>&Jv<Nu|emLeig<U4XGa
E0ecbQb^rhX

delta 708
zcmXYv$x;(h6o$X<baIo<4S^^_&?q7@#GryGg94(012}<zI0I>*B_vdcRZ=c^1Q-1R
zx^m$PErV0JaATFP;5)c<NqIWBInzD&{NK5C-_-u7S^2g5<vY;Lx=kIuHhuI*sAV9^
zInIX}j55Tq;)2Zx7b9Haa+pz@F|PQPtBPwjF?z#X_x-qyVj|29Ke-v@7Pl356qDPp
z{uthC^JU|d%u?Jnut#4kI_o93kl#>DD`vcrKq`}@Q8BBz$DF2~2E~2N10EWL);7o7
zoTHf1JmRrI+N%z=b&ornGEVb^r;2&a0*eOmg<N4_)!A%vH=6R#b2&v;<FKSzX2ts!
zX!M4x`ZkTrGtDYFgIMcQv9LD1o}Di_gI$_6<WgQ!V96_5Bc2uP`7j>bHoSMr^^S)7
zytL|%>1C%R`ctK%n_u=qs>S<lb!_PkC!d{kvTo5?EOA60vrb;v!1VW#$dp*t6nj9j
zfl3ZKy@Qedg!z%ccBSi}SX)jZjztYAiL~7E?I8|}H)xXiW@XM_0)(VC>(xh6TS@CD
zRqu%;>@v}}WRk(8RYqsN5}VthDiJSJ?N@5VClX@H?EB1q6JOfGmu@C3ww9>iHwb!4
zpqmA|Q%-v%n-K&bX=qROKav1Q*UHff=PWH86TT=Dw9+Po4Ghyxhe)Jk^EAf^l93_)
lUVB}g(se>Aam-yh6(<#^6kYA|MG+;F)1q#0MlzGL{{Z@jYgqsQ