Revert "Revert "Fix issue #133""

This reverts commit d1dc038.

Author: mpv1989

src/main/java/com/arangodb/ArangoCollection.java

@@ -242,7 +242,10 @@ public <T> T getDocument(final String key, final Class<T> type, final DocumentRe
 			if (LOGGER.isDebugEnabled()) {
 				LOGGER.debug(e.getMessage(), e);
 			}
-			return null;
+			if (options == null || options.isCatchException()) {
+				return null;
+			}
+			throw e;
 		}
 	}
 
@@ -521,13 +524,18 @@ public Boolean documentExists(final String key) {
 	 * @param options
 	 *            Additional options, can be null
 	 * @return true if the document was found, otherwise false
+	 * @throws ArangoDBException
+	 *             only thrown when {@link DocumentExistsOptions#isCatchException()} == false
 	 */
-	public Boolean documentExists(final String key, final DocumentExistsOptions options) {
+	public Boolean documentExists(final String key, final DocumentExistsOptions options) throws ArangoDBException {
 		try {
 			executor.execute(documentExistsRequest(key, options), VPackSlice.class);
 			return true;
 		} catch (final ArangoDBException e) {
-			return false;
+			if (options == null || options.isCatchException()) {
+				return false;
+			}
+			throw e;
 		}
 	}
 

src/main/java/com/arangodb/model/DocumentExistsOptions.java

@@ -30,9 +30,11 @@ public class DocumentExistsOptions {
 
 	private String ifNoneMatch;
 	private String ifMatch;
+	private boolean catchException;
 
 	public DocumentExistsOptions() {
 		super();
+		catchException = true;
 	}
 
 	public String getIfNoneMatch() {
@@ -63,4 +65,18 @@ public DocumentExistsOptions ifMatch(final String ifMatch) {
 		return this;
 	}
 
+	public boolean isCatchException() {
+		return catchException;
+	}
+
+	/**
+	 * @param catchException
+	 *            whether or not catch possible thrown exceptions
+	 * @return options
+	 */
+	public DocumentExistsOptions catchException(final boolean catchException) {
+		this.catchException = catchException;
+		return this;
+	}
+
 }

src/main/java/com/arangodb/model/DocumentReadOptions.java

@@ -30,9 +30,11 @@ public class DocumentReadOptions {
 
 	private String ifNoneMatch;
 	private String ifMatch;
+	private boolean catchException;
 
 	public DocumentReadOptions() {
 		super();
+		catchException = true;
 	}
 
 	public String getIfNoneMatch() {
@@ -63,4 +65,18 @@ public DocumentReadOptions ifMatch(final String ifMatch) {
 		return this;
 	}
 
+	public boolean isCatchException() {
+		return catchException;
+	}
+
+	/**
+	 * @param catchException
+	 *            whether or not catch possible thrown exceptions
+	 * @return options
+	 */
+	public DocumentReadOptions catchException(final boolean catchException) {
+		this.catchException = catchException;
+		return this;
+	}
+
 }

src/test/java/com/arangodb/ArangoCollectionTest.java

@@ -213,6 +213,12 @@ public void getDocumentNotFound() {
 		assertThat(document, is(nullValue()));
 	}
 
+	@Test(expected = ArangoDBException.class)
+	public void getDocumentNotFoundThrowException() {
+		db.collection(COLLECTION_NAME).getDocument("no", BaseDocument.class,
+			new DocumentReadOptions().catchException(false));
+	}
+
 	@Test(expected = ArangoDBException.class)
 	public void getDocumentWrongKey() {
 		db.collection(COLLECTION_NAME).getDocument("no/no", BaseDocument.class);
@@ -914,6 +920,11 @@ public void documentExists() {
 		assertThat(exists, is(true));
 	}
 
+	@Test(expected = ArangoDBException.class)
+	public void documentExistsThrowExcpetion() {
+		db.collection(COLLECTION_NAME).documentExists("no", new DocumentExistsOptions().catchException(false));
+	}
+
 	@Test
 	public void documentExistsIfMatch() {
 		final DocumentCreateEntity<String> createResult = db.collection(COLLECTION_NAME)