Bug:25862 shortcut for raw IO object or class when handle is registered

ehennum · ehennum · commit 8d2c3df47275 · 2014-02-28T15:49:31.000Z
git-svn-id: svn+ssh://svn.marklogic.com/project/engsvn/client-api/java/branches/b2_0@162566 62cac252-8da6-4816-9e9d-6dc37b19578c
diff --git a/src/main/java/com/marklogic/client/impl/BinaryDocumentImpl.java b/src/main/java/com/marklogic/client/impl/BinaryDocumentImpl.java
@@ -56,7 +56,9 @@ public <T> T readAs(String uri, DocumentMetadataReadHandle metadataHandle, Class
 	throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException {
 		ContentHandle<T> handle = getHandleRegistry().makeHandle(as);
 
-		read(uri, metadataHandle, castAbstractReadHandle(as, handle), start, length);
+		if (null == read(uri, metadataHandle, castAbstractReadHandle(as, handle), start, length)) {
+			return null;
+		}
 
 		return handle.get();
 	}
diff --git a/src/main/java/com/marklogic/client/impl/DocumentManagerImpl.java b/src/main/java/com/marklogic/client/impl/DocumentManagerImpl.java
@@ -138,7 +138,9 @@ public <T> T readAs(String uri, DocumentMetadataReadHandle metadataHandle, Class
 	throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException {
 			ContentHandle<T> handle = getHandleRegistry().makeHandle(as);
 
-			read(uri, metadataHandle, castAbstractReadHandle(as, handle), transform);
+			if (null == read(uri, metadataHandle, castAbstractReadHandle(as, handle), transform)) {
+				return null;
+			}
 
 			return handle.get();
 	}

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,9 @@ public <T> T readAs(String uri, DocumentMetadataReadHandle metadataHandle, Class`
`56`	`56`	`throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException {`
`57`	`57`	`ContentHandle<T> handle = getHandleRegistry().makeHandle(as);`
`58`	`58`
`59`		`- read(uri, metadataHandle, castAbstractReadHandle(as, handle), start, length);`
	`59`	`+ if (null == read(uri, metadataHandle, castAbstractReadHandle(as, handle), start, length)) {`
	`60`	`+ return null;`
	`61`	`+ }`
`60`	`62`
`61`	`63`	`return handle.get();`
`62`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,9 @@ public <T> T readAs(String uri, DocumentMetadataReadHandle metadataHandle, Class`
`138`	`138`	`throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException {`
`139`	`139`	`ContentHandle<T> handle = getHandleRegistry().makeHandle(as);`
`140`	`140`
`141`		`- read(uri, metadataHandle, castAbstractReadHandle(as, handle), transform);`
	`141`	`+ if (null == read(uri, metadataHandle, castAbstractReadHandle(as, handle), transform)) {`
	`142`	`+ return null;`
	`143`	`+ }`
`142`	`144`
`143`	`145`	`return handle.get();`
`144`	`146`	`}`