Fixed rare OOM error someone send a crash report for.

captchafix
Florens Douwes 11 years ago
parent f1e247d783
commit 2bc80563b8
  1. 36
      Clover/src/com/android/volley/toolbox/BasicNetwork.java

@ -16,6 +16,23 @@
package com.android.volley.toolbox; package com.android.volley.toolbox;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.SocketTimeoutException;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.StatusLine;
import org.apache.http.conn.ConnectTimeoutException;
import org.apache.http.impl.cookie.DateUtils;
import org.floens.chan.utils.Logger;
import android.os.SystemClock; import android.os.SystemClock;
import com.android.volley.AuthFailureError; import com.android.volley.AuthFailureError;
@ -31,22 +48,6 @@ import com.android.volley.TimeoutError;
import com.android.volley.VolleyError; import com.android.volley.VolleyError;
import com.android.volley.VolleyLog; import com.android.volley.VolleyLog;
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.StatusLine;
import org.apache.http.conn.ConnectTimeoutException;
import org.apache.http.impl.cookie.DateUtils;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.SocketTimeoutException;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
/** /**
* A network performing Volley requests over an {@link HttpStack}. * A network performing Volley requests over an {@link HttpStack}.
*/ */
@ -222,6 +223,9 @@ public class BasicNetwork implements Network {
bytes.write(buffer, 0, count); bytes.write(buffer, 0, count);
} }
return bytes.toByteArray(); return bytes.toByteArray();
} catch (OutOfMemoryError e) {
Logger.e("Volley BasicNetwork", "Should not happen!", e);
return new byte[0];
} finally { } finally {
try { try {
// Close the InputStream and release the resources by "consuming the content". // Close the InputStream and release the resources by "consuming the content".

Loading…
Cancel
Save