am 73a306c4: Merge "Fix CacheManager to correctly write CacheFiles to disk." into ics-mr1

* commit '73a306c4d2dd650b9a083deb6362fc6ba3cf9032':
  Fix CacheManager to correctly write CacheFiles to disk.

2 files changed, 6 insertions, 6 deletions

diff --git a/Source/WebKit/android/WebCoreSupport/CacheResult.cpp b/Source/WebKit/android/WebCoreSupport/CacheResult.cpp
index 5309c66..6710e49 100644
--- a/Source/WebKit/android/WebCoreSupport/CacheResult.cpp
+++ b/Source/WebKit/android/WebCoreSupport/CacheResult.cpp
@@ -134,11 +134,11 @@ bool CacheResult::writeToFile(const String& filePath) const
     if (!thread)
         return false;
 
-    CacheResult* me = const_cast<CacheResult*>(this);
-    thread->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(me, &CacheResult::writeToFileImpl));
-
     m_filePath = filePath.threadsafeCopy();
     m_isAsyncOperationInProgress = true;
+
+    thread->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(const_cast<CacheResult*>(this), &CacheResult::writeToFileImpl));
+
     while (m_isAsyncOperationInProgress)
         m_condition.wait(m_mutex);
 
@@ -213,10 +213,9 @@ HttpResponseHeaders* CacheResult::responseHeaders() const
     if (!thread)
         return 0;
 
-    CacheResult* me = const_cast<CacheResult*>(this);
-    thread->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(me, &CacheResult::responseHeadersImpl));
-
     m_isAsyncOperationInProgress = true;
+    thread->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(const_cast<CacheResult*>(this), &CacheResult::responseHeadersImpl));
+
     while (m_isAsyncOperationInProgress)
         m_condition.wait(m_mutex);
 
diff --git a/Source/WebKit/android/jni/CacheManager.cpp b/Source/WebKit/android/jni/CacheManager.cpp
index 144b62a..f600d00 100644
--- a/Source/WebKit/android/jni/CacheManager.cpp
+++ b/Source/WebKit/android/jni/CacheManager.cpp
@@ -90,6 +90,7 @@ static jobject getCacheResult(JNIEnv* env, jobject, jstring url)
     String urlWtfString = jstringToWtfString(env, url);
     Vector<char> encodedUrl;
     base64Encode(urlWtfString.utf8().data(), urlWtfString.length(), encodedUrl, false /*insertLFs*/);
+    encodedUrl.append('\0');
     String filePath = pathByAppendingComponent(getCacheFileBaseDir(env), encodedUrl.data());
     if (!result->writeToFile(filePath))
         return 0;