issue #89 close input streams

Charles Greer · Charles Greer · commit 28f9395ec84f · 2014-10-22T11:23:02.000-07:00
diff --git a/src/main/java/com/marklogic/client/extra/dom4j/DOM4JHandle.java b/src/main/java/com/marklogic/client/extra/dom4j/DOM4JHandle.java
@@ -222,7 +222,14 @@ protected void receiveContent(InputStream content) {
 			throw new MarkLogicIOException(e);
 		} catch (DocumentException e) {
 			throw new MarkLogicIOException(e);
+		} finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				// ignore.
+			}
 		}
+
 	}
 
 	@Override
diff --git a/src/main/java/com/marklogic/client/extra/gson/GSONHandle.java b/src/main/java/com/marklogic/client/extra/gson/GSONHandle.java
@@ -16,6 +16,7 @@
 package com.marklogic.client.extra.gson;
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
@@ -182,8 +183,15 @@ protected void receiveContent(InputStream content) {
 			throw new MarkLogicIOException(e);
 		} catch (UnsupportedEncodingException e) {
 			throw new MarkLogicIOException(e);
+		} finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				// ignore.
+			}
 		}
 
+
 	}
 	@Override
 	protected String sendContent() {
diff --git a/src/main/java/com/marklogic/client/extra/jackson/JacksonHandle.java b/src/main/java/com/marklogic/client/extra/jackson/JacksonHandle.java
@@ -197,6 +197,12 @@ protected void receiveContent(InputStream content) {
 			throw new MarkLogicIOException(e);
 		} catch (IOException e) {
 			throw new MarkLogicIOException(e);
+		} finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				// ignore.
+			}
 		}
 
 	}
diff --git a/src/main/java/com/marklogic/client/extra/jdom/JDOMHandle.java b/src/main/java/com/marklogic/client/extra/jdom/JDOMHandle.java
@@ -223,6 +223,12 @@ protected void receiveContent(InputStream content) {
 			throw new MarkLogicIOException(e);
 		} catch (IOException e) {
 			throw new MarkLogicIOException(e);
+		} finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				// ignore.
+			}
 		}
 	}
 
diff --git a/src/main/java/com/marklogic/client/extra/xom/XOMHandle.java b/src/main/java/com/marklogic/client/extra/xom/XOMHandle.java
@@ -203,6 +203,12 @@ protected void receiveContent(InputStream content) {
 			throw new MarkLogicIOException(e);
 		} catch (IOException e) {
 			throw new MarkLogicIOException(e);
+		} finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				// ignore.
+			}
 		}
 	}
 
diff --git a/src/main/java/com/marklogic/client/io/DOMHandle.java b/src/main/java/com/marklogic/client/io/DOMHandle.java
@@ -389,13 +389,16 @@ protected void receiveContent(InputStream content) {
 			domInput.setByteStream(content);
 
 			this.content = parser.parse(domInput);
-			content.close();
-		} catch (IOException e) {
-			logger.error("Failed to parse DOM document from input stream",e);
-			throw new MarkLogicInternalException(e);
 		} catch (ParserConfigurationException e) {
 			logger.error("Failed to parse DOM document from input stream",e);
 			throw new MarkLogicInternalException(e);
+		} finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				//ignore
+			}
+			
 		}
 	}
 	@Override
diff --git a/src/main/java/com/marklogic/client/io/JAXBHandle.java b/src/main/java/com/marklogic/client/io/JAXBHandle.java
@@ -278,6 +278,12 @@ protected void receiveContent(InputStream content) {
 		} catch (UnsupportedEncodingException e) {
 			logger.error("Failed to unmarshall object read from database document",e);
 			throw new MarkLogicIOException(e);
+		}  finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				// ignore.
+			}
 		}
 	}
     @Override
diff --git a/src/main/java/com/marklogic/client/io/QueryOptionsHandle.java b/src/main/java/com/marklogic/client/io/QueryOptionsHandle.java
@@ -1038,7 +1038,13 @@ protected void receiveContent(InputStream content) {
         } catch (UnsupportedEncodingException e) {
             // This can't actually happen...stupid checked exceptions
             throw new MarkLogicBindingException(e);
-        }
+        } finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				// ignore.
+			}
+		}
 	}
 	
 	protected OutputStreamSender sendContent() {
diff --git a/src/main/java/com/marklogic/client/io/TuplesHandle.java b/src/main/java/com/marklogic/client/io/TuplesHandle.java
@@ -15,6 +15,7 @@
  */
 package com.marklogic.client.io;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
@@ -24,19 +25,19 @@
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 
-import com.marklogic.client.query.AggregateResult;
-import com.marklogic.client.query.ValuesMetrics;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.marklogic.client.MarkLogicBindingException;
 import com.marklogic.client.MarkLogicIOException;
-import com.marklogic.client.query.Tuple;
 import com.marklogic.client.impl.TuplesBuilder;
-import com.marklogic.client.query.TuplesResults;
-import com.marklogic.client.query.ValuesDefinition;
 import com.marklogic.client.io.marker.OperationNotSupported;
 import com.marklogic.client.io.marker.TuplesReadHandle;
+import com.marklogic.client.query.AggregateResult;
+import com.marklogic.client.query.Tuple;
+import com.marklogic.client.query.TuplesResults;
+import com.marklogic.client.query.ValuesDefinition;
+import com.marklogic.client.query.ValuesMetrics;
 
 /**
  * A TuplesHandle represents a set of tuples returned by a query on the server.
@@ -109,7 +110,13 @@ protected void receiveContent(InputStream content) {
         } catch (JAXBException e) {
 			logger.error("Failed to unmarshall tuples",e);
 			throw new MarkLogicIOException(e);
-        }
+        } finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				// ignore.
+			}
+		}
     }
 
     /**
diff --git a/src/main/java/com/marklogic/client/io/ValuesHandle.java b/src/main/java/com/marklogic/client/io/ValuesHandle.java
@@ -15,6 +15,7 @@
  */
 package com.marklogic.client.io;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
@@ -24,19 +25,19 @@
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 
-import com.marklogic.client.query.AggregateResult;
-import com.marklogic.client.query.ValuesMetrics;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.marklogic.client.MarkLogicBindingException;
 import com.marklogic.client.MarkLogicIOException;
-import com.marklogic.client.query.CountedDistinctValue;
 import com.marklogic.client.impl.ValuesBuilder;
-import com.marklogic.client.query.ValuesDefinition;
-import com.marklogic.client.query.ValuesResults;
 import com.marklogic.client.io.marker.OperationNotSupported;
 import com.marklogic.client.io.marker.ValuesReadHandle;
+import com.marklogic.client.query.AggregateResult;
+import com.marklogic.client.query.CountedDistinctValue;
+import com.marklogic.client.query.ValuesDefinition;
+import com.marklogic.client.query.ValuesMetrics;
+import com.marklogic.client.query.ValuesResults;
 
 /**
  * A ValuesHandle represents a list of values or of tuples
@@ -114,7 +115,13 @@ protected void receiveContent(InputStream content) {
         } catch (JAXBException e) {
 			logger.error("Failed to unmarshall values",e);
 			throw new MarkLogicIOException(e);
-        }
+        } finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				// ignore.
+			}
+		}
     }
 
     /**
diff --git a/src/main/java/com/marklogic/client/io/ValuesListHandle.java b/src/main/java/com/marklogic/client/io/ValuesListHandle.java
@@ -15,6 +15,7 @@
  */
 package com.marklogic.client.io;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
@@ -30,9 +31,9 @@
 import com.marklogic.client.MarkLogicBindingException;
 import com.marklogic.client.MarkLogicIOException;
 import com.marklogic.client.impl.ValuesListBuilder;
-import com.marklogic.client.query.ValuesListResults;
 import com.marklogic.client.io.marker.OperationNotSupported;
 import com.marklogic.client.io.marker.ValuesListReadHandle;
+import com.marklogic.client.query.ValuesListResults;
 
 /**
  * A ValuesListHandle represents a list of available named lexicon configurations
@@ -127,7 +128,14 @@ protected void receiveContent(InputStream content) {
         } catch (JAXBException e) {
 			logger.error("Failed to unmarshall values list",e);
 			throw new MarkLogicIOException(e);
-        }
+        } finally {
+			try {
+				content.close();
+			} catch (IOException e) {
+				// ignore.
+			}
+		}
+
     }
 
     /**
diff --git a/src/test/java/com/marklogic/client/test/extra/JacksonHandleTest.java b/src/test/java/com/marklogic/client/test/extra/JacksonHandleTest.java
@@ -18,6 +18,8 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+import java.io.IOException;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -28,6 +30,9 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.marklogic.client.document.JSONDocumentManager;
 import com.marklogic.client.extra.jackson.JacksonHandle;
+import com.marklogic.client.query.QueryDefinition;
+import com.marklogic.client.query.QueryManager;
+import com.marklogic.client.query.StructuredQueryBuilder;
 import com.marklogic.client.test.Common;
 
 public class JacksonHandleTest {
@@ -80,4 +85,24 @@ public void testReadWrite() {
 		// delete the document
 		docMgr.delete(docId);
 	}
+
+	@Test
+	public void test105Searches() throws IOException {
+		QueryManager queryMgr = Common.client.newQueryManager();
+		StructuredQueryBuilder qb = queryMgr.newStructuredQueryBuilder();
+		
+		for (int i=0;i<105;i++) {
+			for (QueryDefinition t : new QueryDefinition[] { qb.term("leaf3"),
+					qb.build(qb.value(qb.element("leaf"), "leaf3")) }) {
+				JacksonHandle results = queryMgr.search(t, new JacksonHandle());
+				assertNotNull(results);
+				JsonNode jsonResults =results.get();
+				@SuppressWarnings("unused")
+				String resultString = results.getMapper().writeValueAsString(jsonResults);
+				// ignore.
+			}
+		}
+	}	
+
 }
+

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,14 @@ protected void receiveContent(InputStream content) {`
`222`	`222`	`throw new MarkLogicIOException(e);`
`223`	`223`	`} catch (DocumentException e) {`
`224`	`224`	`throw new MarkLogicIOException(e);`
	`225`	`+ } finally {`
	`226`	`+ try {`
	`227`	`+ content.close();`
	`228`	`+ } catch (IOException e) {`
	`229`	`+ // ignore.`
	`230`	`+ }`
`225`	`231`	`}`
	`232`	`+`
`226`	`233`	`}`
`227`	`234`
`228`	`235`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,12 @@ protected void receiveContent(InputStream content) {`
`197`	`197`	`throw new MarkLogicIOException(e);`
`198`	`198`	`} catch (IOException e) {`
`199`	`199`	`throw new MarkLogicIOException(e);`
	`200`	`+ } finally {`
	`201`	`+ try {`
	`202`	`+ content.close();`
	`203`	`+ } catch (IOException e) {`
	`204`	`+ // ignore.`
	`205`	`+ }`
`200`	`206`	`}`
`201`	`207`
`202`	`208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,12 @@ protected void receiveContent(InputStream content) {`
`223`	`223`	`throw new MarkLogicIOException(e);`
`224`	`224`	`} catch (IOException e) {`
`225`	`225`	`throw new MarkLogicIOException(e);`
	`226`	`+ } finally {`
	`227`	`+ try {`
	`228`	`+ content.close();`
	`229`	`+ } catch (IOException e) {`
	`230`	`+ // ignore.`
	`231`	`+ }`
`226`	`232`	`}`
`227`	`233`	`}`
`228`	`234`
Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,12 @@ protected void receiveContent(InputStream content) {`
`203`	`203`	`throw new MarkLogicIOException(e);`
`204`	`204`	`} catch (IOException e) {`
`205`	`205`	`throw new MarkLogicIOException(e);`
	`206`	`+ } finally {`
	`207`	`+ try {`
	`208`	`+ content.close();`
	`209`	`+ } catch (IOException e) {`
	`210`	`+ // ignore.`
	`211`	`+ }`
`206`	`212`	`}`
`207`	`213`	`}`
`208`	`214`
Original file line number	Diff line number	Diff line change
`@@ -278,6 +278,12 @@ protected void receiveContent(InputStream content) {`
`278`	`278`	`} catch (UnsupportedEncodingException e) {`
`279`	`279`	`logger.error("Failed to unmarshall object read from database document",e);`
`280`	`280`	`throw new MarkLogicIOException(e);`
	`281`	`+ } finally {`
	`282`	`+ try {`
	`283`	`+ content.close();`
	`284`	`+ } catch (IOException e) {`
	`285`	`+ // ignore.`
	`286`	`+ }`
`281`	`287`	`}`
`282`	`288`	`}`
`283`	`289`	`@Override`