[email protected] 8 years ago
parent
commit
4d67b2d8c7

+ 1 - 1
oxygine/SDL/android/lib/src/org/oxygine/lib/HttpRequests.java

@@ -144,8 +144,8 @@ class HttpRequest extends AsyncTask<RequestDetails, Integer, String> {
             nativeHttpRequestSuccess(details.handle);
 
         } catch (Exception e) {
-            nativeHttpRequestError(details.handle);
             Log.v("HttpRequest", "error: " + e.toString());
+            nativeHttpRequestError(details.handle);            
             return e.toString();
         } finally {
             try {

+ 3 - 3
oxygine/src/core/android/HttpRequestJavaTask.cpp

@@ -48,12 +48,12 @@ namespace oxygine
 
     HttpRequestJavaTask::HttpRequestJavaTask(): _handle(0)
     {
-
+        log::messageln("HttpRequestJavaTask %x", this);
     }
 
     HttpRequestJavaTask::~HttpRequestJavaTask()
     {
-        log::messageln("~HttpRequestJavaTask");
+        log::messageln("~HttpRequestJavaTask %x", this);
     }
 
     void HttpRequestJavaTask::_run()
@@ -108,7 +108,7 @@ namespace oxygine
 
         write(data, size);
 
-        env->ReleaseByteArrayElements(jdata, data, 0);
+        env->ReleaseByteArrayElements(jdata, data, JNI_ABORT);
     }
 
     void HttpRequestJavaTask::complete_()

+ 10 - 1
oxygine/src/core/curl/HttpRequestCurlTask.cpp

@@ -3,6 +3,7 @@
 #include "core/ThreadDispatcher.h"
 #include "SDL.h"
 #include "pthread.h"
+#include "key.h"
 
 namespace oxygine
 {
@@ -84,6 +85,14 @@ namespace oxygine
                     /* get file descriptors from the transfers */
                     curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
 
+#ifdef OX_DEBUG___
+                    if (fdread.fd_count > 0)
+                    {
+                        if (key::isPressed(SDL_SCANCODE_P))
+                            closesocket(fdread.fd_array[0]);
+                    }
+#endif
+
                     if (maxfd == -1)
                     {
                         sleep(100);
@@ -194,7 +203,7 @@ namespace oxygine
 
     HttpRequestTaskCURL::~HttpRequestTaskCURL()
     {
-
+        log::messageln("~HttpRequestTaskCURL");
         if (_easy)
             curl_easy_cleanup(_easy);
         _easy = 0;