Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinston Prakash2012-02-27 14:14:21 -0500
committerWinston Prakash2012-02-27 14:14:21 -0500
commitc75ffc8a198daa1f5349cc2327a2aaac7dc058a1 (patch)
treeca8f6ad49eaeb0e6604124bb5b95d604d1f4d6aa
parentcc9920be00067fbe7fef452c496ea818facf2c22 (diff)
parent6174d4d22170ca06118421e1e69cf44d11e3b831 (diff)
downloadorg.eclipse.hudson.core-c75ffc8a198daa1f5349cc2327a2aaac7dc058a1.tar.gz
org.eclipse.hudson.core-c75ffc8a198daa1f5349cc2327a2aaac7dc058a1.tar.xz
org.eclipse.hudson.core-c75ffc8a198daa1f5349cc2327a2aaac7dc058a1.zip
Merge branch 'refs/heads/master' into security-ext
-rw-r--r--hudson-core/src/main/java/hudson/model/Label.java4
-rw-r--r--hudson-parent/pom.xml2
-rw-r--r--hudson-war/pom.xml4
3 files changed, 5 insertions, 5 deletions
diff --git a/hudson-core/src/main/java/hudson/model/Label.java b/hudson-core/src/main/java/hudson/model/Label.java
index 445befb2..276238ef 100644
--- a/hudson-core/src/main/java/hudson/model/Label.java
+++ b/hudson-core/src/main/java/hudson/model/Label.java
@@ -158,7 +158,7 @@ public abstract class Label extends Actionable implements Comparable<Label>, Mod
* Gets all {@link Node}s that belong to this label.
*/
@Exported
- public Set<Node> getNodes() {
+ public synchronized Set<Node> getNodes() {
Set<Node> nodes = this.nodes;
if(nodes!=null) return nodes;
@@ -177,7 +177,7 @@ public abstract class Label extends Actionable implements Comparable<Label>, Mod
* Gets all {@link Cloud}s that can launch for this label.
*/
@Exported
- public Set<Cloud> getClouds() {
+ public synchronized Set<Cloud> getClouds() {
if(clouds==null) {
Set<Cloud> r = new HashSet<Cloud>();
Hudson h = Hudson.getInstance();
diff --git a/hudson-parent/pom.xml b/hudson-parent/pom.xml
index 6ef7ef2e..46d80e33 100644
--- a/hudson-parent/pom.xml
+++ b/hudson-parent/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.hudson</groupId>
<artifactId>hudson-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0-M1</version>
<packaging>pom</packaging>
<name>Hudson Parent</name>
diff --git a/hudson-war/pom.xml b/hudson-war/pom.xml
index 1428d164..b1b49681 100644
--- a/hudson-war/pom.xml
+++ b/hudson-war/pom.xml
@@ -203,7 +203,7 @@
<artifactItem>
<groupId>org.eclipse.hudson.main</groupId>
<artifactId>maven3-plugin</artifactId>
- <version>3.0.0-1</version>
+ <version>3.0.0-2</version>
<type>hpi</type>
<overWrite>true</overWrite>
<outputDirectory>target/generated-resources/WEB-INF/plugins</outputDirectory>
@@ -212,7 +212,7 @@
<artifactItem>
<groupId>org.eclipse.hudson.main</groupId>
<artifactId>maven3-snapshots</artifactId>
- <version>3.0.0-1</version>
+ <version>3.0.0-2</version>
<type>hpi</type>
<overWrite>true</overWrite>
<outputDirectory>target/generated-resources/WEB-INF/plugins</outputDirectory>

Back to the top