Fix deleting job properties issue on web UI. (azkaban#1598)

chensj2018 · Jan 9, 2018 · 351b730 · 351b730
1 parent 1bb277d
commit 351b730
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/azkaban-web-server/src/main/java/azkaban/webapp/servlet/ProjectManagerServlet.java b/azkaban-web-server/src/main/java/azkaban/webapp/servlet/ProjectManagerServlet.java
@@ -1321,17 +1321,12 @@ private void handleJobPage(final HttpServletRequest req, final HttpServletRespon
         return;
       }
 
-      final Props jobProp = this.projectManager
-          .getProperties(project, flow, jobName, node.getJobSource());
-      Props overrideProp =
-          this.projectManager.getJobOverrideProperty(project, flow, jobName, node.getJobSource());
-      if (overrideProp == null) {
-        overrideProp = new Props();
-      }
-      final Props comboProp = new Props(jobProp);
-      for (final String key : overrideProp.getKeySet()) {
-        comboProp.put(key, overrideProp.get(key));
+      Props jobProp = this.projectManager
+          .getJobOverrideProperty(project, flow, jobName, node.getJobSource());
+      if (jobProp == null) {
+        jobProp = this.projectManager.getProperties(project, flow, jobName, node.getJobSource());
       }
+
       page.add("jobid", node.getId());
       page.add("jobtype", node.getType());
 
@@ -1375,8 +1370,8 @@ private void handleJobPage(final HttpServletRequest req, final HttpServletRespon
       final ArrayList<Pair<String, String>> parameters =
           new ArrayList<>();
       // Parameter
-      for (final String key : comboProp.getKeySet()) {
-        final String value = comboProp.get(key);
+      for (final String key : jobProp.getKeySet()) {
+        final String value = jobProp.get(key);
         parameters.add(new Pair<>(key, value));
       }