From 5931284151a834c59c5b7bfb95aa79095de94d8b Mon Sep 17 00:00:00 2001
From: Thomas White <tomwhite@apache.org>
Date: Tue, 8 Feb 2011 05:35:02 +0000
Subject: [PATCH] WHIRR-232. NPE for stopped instances on EC2.

git-svn-id: https://svn.apache.org/repos/asf/incubator/whirr/trunk@1068271 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                                     | 2 ++
 .../apache/whirr/cluster/actions/ConfigureClusterAction.java    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4ef6213e..f59eafea 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -38,6 +38,8 @@ Trunk (unreleased changes)
     WHIRR-217. Log files should not be included in tarball or checked 
     by RAT (tomwhite via asavu)
 
+    WHIRR-232. NPE for stopped instances on EC2. (tomwhite)
+
 Release 0.3.0 - 2011-01-15
 
   NEW FEATURES
diff --git a/core/src/main/java/org/apache/whirr/cluster/actions/ConfigureClusterAction.java b/core/src/main/java/org/apache/whirr/cluster/actions/ConfigureClusterAction.java
index c6cb79e3..266a747e 100644
--- a/core/src/main/java/org/apache/whirr/cluster/actions/ConfigureClusterAction.java
+++ b/core/src/main/java/org/apache/whirr/cluster/actions/ConfigureClusterAction.java
@@ -99,7 +99,7 @@ private Predicate<NodeMetadata> toNodeMetadataPredicate(final ClusterSpec cluste
       @Override
       public boolean apply(NodeMetadata nodeMetadata) {
         // Check it's the correct cluster
-        if (!nodeMetadata.getGroup().equals(clusterSpec.getClusterName())) {
+        if (!clusterSpec.getClusterName().equals(nodeMetadata.getGroup())) {
           return false;
         }
         Instance instance = nodeIdToInstanceMap.get(nodeMetadata.getId());