Fixed #3389. turn off refresh rails data for differential push (#3390)

ngageoint · Aug 14, 2019 · 88fadeb · 88fadeb
1 parent cd68c55
commit 88fadeb
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/hoot-services/src/main/java/hoot/services/controllers/grail/GrailResource.java b/hoot-services/src/main/java/hoot/services/controllers/grail/GrailResource.java
@@ -422,23 +422,25 @@ public Response differentialPush(@Context HttpServletRequest request,
             String grandparentJobId = DbUtils.getParentId(reqParams.getParentId());
             Long resourceId = DbUtils.getMapIdByJobId(grandparentJobId); // the merged layer
 
-            // Setup workflow to refresh rails data after the push
-            long referenceId = DbUtils.getMergedReference(resourceId);
-            Map<String, String> mapTags = DbUtils.getMapsTableTags(referenceId);
-
-            GrailParams refreshParams = new GrailParams();
-            refreshParams.setUser(user);
-            refreshParams.setWorkDir(workDir);
-            refreshParams.setOutput(DbUtils.getDisplayNameById(referenceId));
-            refreshParams.setBounds(mapTags.get("bbox"));
-            refreshParams.setParentId("grail_" + mapTags.get("bbox").replace(",", "_"));
-
-            try {
-                List<Command> refreshWorkflow = setupRailsPull(jobId, refreshParams);
-                workflow.addAll(refreshWorkflow);
-            }
-            catch(UnavailableException exc) {
-                return Response.status(Response.Status.SERVICE_UNAVAILABLE).entity(exc.getMessage()).build();
+            if(resourceId != null) {
+                // Setup workflow to refresh rails data after the push
+                long referenceId = DbUtils.getMergedReference(resourceId);
+                Map<String, String> mapTags = DbUtils.getMapsTableTags(referenceId);
+
+                GrailParams refreshParams = new GrailParams();
+                refreshParams.setUser(user);
+                refreshParams.setWorkDir(workDir);
+                refreshParams.setOutput(DbUtils.getDisplayNameById(referenceId));
+                refreshParams.setBounds(mapTags.get("bbox"));
+                refreshParams.setParentId("grail_" + mapTags.get("bbox").replace(",", "_"));
+
+                try {
+                    List<Command> refreshWorkflow = setupRailsPull(jobId, refreshParams);
+                    workflow.addAll(refreshWorkflow);
+                }
+                catch(UnavailableException exc) {
+                    return Response.status(Response.Status.SERVICE_UNAVAILABLE).entity(exc.getMessage()).build();
+                }
             }
 
             jobProcessor.submitAsync(new Job(jobId, user.getId(), workflow.toArray(new Command[workflow.size()]), JobType.UPLOAD_CHANGESET, reqParams.getParentId()));