Fix #781: Do not get results if there is an error

Author: Burak Serdar

crud/src/main/java/com/redhat/lightblue/mediator/Mediator.java

@@ -499,25 +499,25 @@ public Response find(FindRequest req) {
                 CRUDFindResponse result = finder.find(ctx, req.getCRUDFindRequest());
                 ctx.measure.end("finder.find");
 
-                ctx.measure.begin("postProcessFound");
-                DocumentStream<DocCtx> docStream=ctx.getDocumentStream();
-                List<ResultMetadata> rmd=new ArrayList<>();
-                response.setEntityData(factory.getNodeFactory().arrayNode());
-                for(;docStream.hasNext();) {
-                    DocCtx doc=docStream.next();
-                    if(!doc.hasErrors()) {          
-                        response.addEntityData(doc.getOutputDocument().getRoot());
-                        rmd.add(doc.getResultMetadata());
+                if(!ctx.hasErrors()) {
+                    ctx.measure.begin("postProcessFound");
+                    DocumentStream<DocCtx> docStream=ctx.getDocumentStream();
+                    List<ResultMetadata> rmd=new ArrayList<>();
+                    response.setEntityData(factory.getNodeFactory().arrayNode());
+                    for(;docStream.hasNext();) {
+                        DocCtx doc=docStream.next();
+                        if(!doc.hasErrors()) {          
+                            response.addEntityData(doc.getOutputDocument().getRoot());
+                            rmd.add(doc.getResultMetadata());
                     } else {
-                        DataError error=doc.getDataError();
-                        if(error!=null)
-                            response.getDataErrors().add(error);
+                            DataError error=doc.getDataError();
+                            if(error!=null)
+                                response.getDataErrors().add(error);
+                        }
                     }
-                }
-                docStream.close();
-                response.setResultMetadata(rmd);
-                ctx.measure.end("postProcessFound");
-                if (!ctx.hasErrors()) {
+                    docStream.close();
+                    response.setResultMetadata(rmd);
+                    ctx.measure.end("postProcessFound");
                     ctx.setStatus(OperationStatus.COMPLETE);
                 } else {
                     ctx.setStatus(OperationStatus.ERROR);

crud/src/test/java/com/redhat/lightblue/mediator/MediatorTest.java

@@ -53,6 +53,7 @@
 import com.redhat.lightblue.query.ValueComparisonExpression;
 import com.redhat.lightblue.util.JsonDoc;
 import com.redhat.lightblue.util.Path;
+import com.redhat.lightblue.util.Error;
 
 public class MediatorTest extends AbstractMediatorTest {
 
@@ -383,6 +384,22 @@ public void findResultMdTest() throws Exception {
         }
     }
 
+    @Test
+    public void queryTimeoutTest() throws Exception {
+        FindRequest req = new FindRequest();
+        req.setEntityVersion(new EntityVersion("test", "1.0"));
+        
+        mdManager.md.getAccess().getFind().setRoles("anyone");
+        mockCrudController.findResponse = new CRUDFindResponse();
+        mockCrudController.findCb=ctx->{
+            ctx.addError(Error.get(CrudConstants.ERR_DATASOURCE_TIMEOUT,"timeout"));
+        };
+        Response response = mediator.find(req);
+        Assert.assertEquals(OperationStatus.ERROR, response.getStatus());
+        Assert.assertEquals(1,response.getErrors().size());
+        Assert.assertEquals(CrudConstants.ERR_DATASOURCE_TIMEOUT,response.getErrors().get(0).getErrorCode());
+    }
+
     @Test
     public void findQueryFieldRoleTest() throws Exception {
         FindRequest req = new FindRequest();