Skip to content

Commit

Permalink
[FIXED JENKINS-17451] "projects tied to slave" shows unrelated maven …
Browse files Browse the repository at this point in the history
…module jobs. shows TopLevelItem only.
  • Loading branch information
ssogabe committed Apr 6, 2013
1 parent 94f781c commit 3a6de84
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
3 changes: 3 additions & 0 deletions changelog.html
Expand Up @@ -64,6 +64,9 @@
<li class=rfe>
Better display of parameters in queue items.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-17454">issue 17454</a>)
<li class='bug'>
"projects tied to slave" shows unrelated maven module jobs
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-17451">issue 17451</a>)
</ul>
</div><!--=TRUNK-END=-->

Expand Down
5 changes: 3 additions & 2 deletions core/src/main/java/hudson/model/Label.java
Expand Up @@ -61,6 +61,7 @@
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import java.util.logging.Logger;

/**
* Group of {@link Node}s.
Expand Down Expand Up @@ -335,13 +336,13 @@ private String toString(Collection<? extends ModelObject> model) {
@Exported
public List<AbstractProject> getTiedJobs() {
List<AbstractProject> r = new ArrayList<AbstractProject>();
for (AbstractProject<?,?> p : Jenkins.getInstance().getAllItems(AbstractProject.class)) {
for (AbstractProject<?,?> p : Jenkins.getInstance().getItems(AbstractProject.class)) {

This comment has been minimized.

Copy link
@jglick

jglick Apr 8, 2013

Member

No, this is wrong, regresses JENKINS-15666. My fault for not writing a test for it I guess.

This comment has been minimized.

Copy link
@jglick

jglick Apr 8, 2013

Member

Need to use Jenkins.getInstance().getAllItems(AbstractProject.class) but perhaps this needs to also filter on TopLevelItem?

This comment has been minimized.

Copy link
@jglick

jglick Apr 8, 2013

Member

Reverted in rc and master pending a proper fix.

if(this.equals(p.getAssignedLabel()))
r.add(p);
}
return r;
}

public boolean contains(Node node) {
return getNodes().contains(node);
}
Expand Down

0 comments on commit 3a6de84

Please sign in to comment.