Resolve Hudson-9077 (Jelly exception running Build now on a project from the homepage after upgrade to 2.2.0 from 2.1.0)

Signed-off-by: Winston Prakash <winston.prakash@gmail.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/hudson-core/src/main/java/hudson/model/Job.java b/hudson-core/src/main/java/hudson/model/Job.java
index c2da67a..853312c 100644
--- a/hudson-core/src/main/java/hudson/model/Job.java
+++ b/hudson-core/src/main/java/hudson/model/Job.java
@@ -366,13 +366,13 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
         if (properties == null) // didn't exist < 1.72
             properties = new CopyOnWriteList<JobProperty<? super JobT>>();
 
-        for (JobProperty p : properties)
-            p.setOwner(this);
-
         if(cascadingChildrenNames == null){
              cascadingChildrenNames = new CopyOnWriteArraySet<String>();
         }
         buildProjectProperties();
+        for (JobProperty p : getAllProperties()) {
+            p.setOwner(this);
+        }
     }
 
     /**
@@ -436,7 +436,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
     /**
      * Adds cascading JobProperty.
      *
-     * @param cascadingJobProperty BaseProjectProperty wrapper for JobProperty.
+     * @param projectProperty BaseProjectProperty wrapper for JobProperty.
      */
     private void addCascadingJobProperty(BaseProjectProperty projectProperty) {
         if (null != projectProperty) {