Merge pull request #544 from lidashuang/master

Fixed not allow access data on code not equal 200
chukong · Aug 30, 2015 · 4936aa7 · 4936aa7
2 parents c0bea00 + bd137bf
commit 4936aa7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/lib/cocos2d-x/cocos2dx/platform/android/java/src/org/cocos2dx/lib/QuickHTTPInterface.java b/lib/cocos2d-x/cocos2dx/platform/android/java/src/org/cocos2dx/lib/QuickHTTPInterface.java
@@ -325,8 +325,15 @@ static int getContentLeng(HttpURLConnection http) {
 
     static byte[] getResponedString(HttpURLConnection http) {
         try {
-            DataInputStream in = new DataInputStream(http.getInputStream());
-
+            int statusCode = http.getResponseCode(); 
+
+            DataInputStream in = null;
+            if(statusCode != 200 && statusCode != 201) {
+                in = new DataInputStream(http.getErrorStream());
+            }else{
+                in = new DataInputStream(http.getInputStream());
+            }
+
             byte[] buffer = new byte[1024];
             byte[] retBuf = null;
             int len = in.read(buffer);

diff --git a/lib/cocos2d-x/external/extra/platform/android/CCHTTPRequestAndroid.cpp b/lib/cocos2d-x/external/extra/platform/android/CCHTTPRequestAndroid.cpp
@@ -606,7 +606,7 @@ void CCHTTPRequest::onRequest(void)
     m_errorCode = code;
     m_responseCode = code;
     m_errorMessage = (code >= 200 && code < 300) ? "" : getResponedErrJava();
-    m_state = (code == 200) ? kCCHTTPRequestStateCompleted : kCCHTTPRequestStateFailed;
+    m_state = (code >= 200 && code < 600) ? kCCHTTPRequestStateCompleted : kCCHTTPRequestStateFailed;
     m_curlState = kCCHTTPRequestCURLStateClosed;
 }