Merge pull request #203 from ProTip/master

These lines need to be moved so the NextToken makes it into the request ...
AdRoll · Aug 24, 2014 · 63104b5 · 63104b5
2 parents 9ded52d + 96e81c2
commit 63104b5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cloudwatch/cloudwatch.go b/cloudwatch/cloudwatch.go
@@ -283,9 +283,9 @@ func (c *CloudWatch) ListMetrics(req *ListMetricsRequest) (result *ListMetricsRe
 	err = c.query("GET", "/", params, &result)
 	metrics := result.ListMetricsResult.Metrics
 	if result.ListMetricsResult.NextToken != "" {
-		params = aws.MakeParams("ListMetrics")
-		params["NextToken"] = result.ListMetricsResult.NextToken
 		for result.ListMetricsResult.NextToken != "" && err == nil {
+			params = aws.MakeParams("ListMetrics")
+			params["NextToken"] = result.ListMetricsResult.NextToken
 			result = new(ListMetricsResponse)
 			err = c.query("GET", "/", params, &result)
 			if err == nil {