Protect getRenderPartition call. (#700)

AcademySoftwareFoundation · Jun 9, 2020 · 4bad38a · 4bad38a
1 parent eb8bbc3
commit 4bad38a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/cuebot/src/main/java/com/imageworks/spcue/servant/ManageFrame.java b/cuebot/src/main/java/com/imageworks/spcue/servant/ManageFrame.java
@@ -279,11 +279,12 @@ public void addRenderPartition(FrameAddRenderPartitionRequest request,
                     .setRenderPartition(partition)
                     .build());
             responseObserver.onCompleted();
+        } else {
+            responseObserver.onError(Status.INTERNAL
+                    .withDescription("Failed to find suitable frames.")
+                    .augmentDescription("customException()")
+                    .asRuntimeException());
         }
-        responseObserver.onError(Status.INTERNAL
-                .withDescription("Failed to find suitable frames.")
-                .augmentDescription("customException()")
-                .asRuntimeException());
     }
 
     @Override

diff --git a/cuebot/src/main/java/com/imageworks/spcue/servant/ManageJob.java b/cuebot/src/main/java/com/imageworks/spcue/servant/ManageJob.java
@@ -569,15 +569,22 @@ public void addRenderPartition(JobAddRenderPartRequest request, StreamObserver<J
         lha.setType(RenderPartitionType.JOB_PARTITION);
 
         if (localBookingSupport.bookLocal(job, request.getHost(), request.getUsername(), lha)) {
-            RenderPartition renderPart = whiteboard.getRenderPartition(lha);
-            responseObserver.onNext(JobAddRenderPartResponse.newBuilder()
-                    .setRenderPartition(renderPart)
-                    .build());
-            responseObserver.onCompleted();
+            try {
+                RenderPartition renderPart = whiteboard.getRenderPartition(lha);
+                responseObserver.onNext(JobAddRenderPartResponse.newBuilder()
+                        .setRenderPartition(renderPart)
+                        .build());
+                responseObserver.onCompleted();
+            } catch (EmptyResultDataAccessException e) {
+                responseObserver.onError(Status.INTERNAL
+                        .withDescription("Failed to allocate render partition to host.")
+                        .asRuntimeException());
+            }
+        } else {
+            responseObserver.onError(Status.INTERNAL
+                    .withDescription("Failed to find suitable frames.")
+                    .asRuntimeException());
         }
-        responseObserver.onError(Status.INTERNAL
-                .withDescription("Failed to find suitable frames.")
-                .asRuntimeException());
     }
 
     @Override