From f1f6491a5635f9e0d8115bee0d6fc3316c9330bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francesco=20Chicchiricc=C3=B2?= <--global>
Date: Sun, 13 Jul 2014 07:56:24 +0200
Subject: [PATCH] Removing all leaks on Android

---
 .../request/batch/AbstractODataBatchRequest.java     | 12 ++++++------
 .../request/batch/ODataSingleResponseItem.java       |  9 +++++++++
 .../request/batch/v3/ODataBatchRequestImpl.java      |  8 ++++++++
 .../request/batch/v4/ODataBatchRequestImpl.java      |  9 +++++++++
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequest.java
index df03f49c4..428dbf59c 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequest.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequest.java
@@ -49,10 +49,6 @@ public abstract class AbstractODataBatchRequest<V extends ODataResponse, T exten
    */
   protected final List<ODataBatchResponseItem> expectedResItems = new ArrayList<ODataBatchResponseItem>();
 
-  protected void addExpectedResItem(ODataBatchResponseItem item) {
-    expectedResItems.add(item);
-  }
-
   /**
    * Constructor.
    *
@@ -69,6 +65,10 @@ public abstract class AbstractODataBatchRequest<V extends ODataResponse, T exten
     setContentType(ContentType.MULTIPART_MIXED + ";" + ODataBatchConstants.BOUNDARY + "=" + boundary);
   }
 
+  protected void addExpectedResItem(final ODataBatchResponseItem item) {
+    expectedResItems.add(item);
+  }
+
   /**
    * {@inheritDoc }
    */
@@ -78,11 +78,11 @@ public abstract class AbstractODataBatchRequest<V extends ODataResponse, T exten
 
   /**
    * {@inheritDoc}
-   * <p>
+   * <br/>
    * This operation is unsupported by a batch request.
    */
   @Override
-  public void batch(CommonODataBatchRequest req) {
+  public void batch(final CommonODataBatchRequest req) {
     throw new UnsupportedOperationException("A batch request is not batchable");
   }
 }
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataSingleResponseItem.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataSingleResponseItem.java
index cd53ede9d..b27f5b036 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataSingleResponseItem.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataSingleResponseItem.java
@@ -83,4 +83,13 @@ public class ODataSingleResponseItem extends AbstractODataBatchResponseItem {
   public void remove() {
     throw new UnsupportedOperationException("Operation not supported.");
   }
+
+  @Override
+  public void close() {
+    super.close();
+    if (current != null && !(current instanceof AsyncResponseImpl) && !(current instanceof ODataBatchErrorResponse)) {
+      current.close();
+    }
+  }
+
 }
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/ODataBatchRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/ODataBatchRequestImpl.java
index 8863161ac..54950e7eb 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/ODataBatchRequestImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/ODataBatchRequestImpl.java
@@ -121,5 +121,13 @@ public class ODataBatchRequestImpl
     public Iterator<ODataBatchResponseItem> getBody() {
       return new ODataBatchResponseManager(this, expectedResItems);
     }
+
+    @Override
+    public void close() {
+      for (ODataBatchResponseItem resItem : expectedResItems) {
+        resItem.close();
+      }
+      super.close();
+    }
   }
 }
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v4/ODataBatchRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v4/ODataBatchRequestImpl.java
index f7dc70797..52d5194ad 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v4/ODataBatchRequestImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v4/ODataBatchRequestImpl.java
@@ -124,5 +124,14 @@ public class ODataBatchRequestImpl
     public Iterator<ODataBatchResponseItem> getBody() {
       return new ODataBatchResponseManager(this, expectedResItems, continueOnError);
     }
+
+    @Override
+    public void close() {
+      for (ODataBatchResponseItem resItem : expectedResItems) {
+        resItem.close();
+      }
+      super.close();
+    }
+
   }
 }