Merge pull request #5427 from fabianofranz/bugs_1275234

OpenShift Bot · OpenShift Bot · commit 46d8271a97de · 2015-10-27T15:18:43.000-04:00
Merged by openshift-bot
diff --git a/pkg/deploy/scaler/scale.go b/pkg/deploy/scaler/scale.go
@@ -39,7 +39,7 @@ func (scaler *DeploymentConfigScaler) Scale(namespace, name string, newSize uint
 	}
 	cond := kubectl.ScaleCondition(scaler, preconditions, namespace, name, newSize)
 	if err := wait.Poll(retry.Interval, retry.Timeout, cond); err != nil {
-		if scaleErr := err.(kubectl.ControllerScaleError); kerrors.IsNotFound(scaleErr.ActualError) {
+		if scaleErr, ok := err.(kubectl.ControllerScaleError); ok && kerrors.IsNotFound(scaleErr.ActualError) {
 			glog.Infof("No deployment found for dc/%s. Scaling the deployment configuration template...", name)
 			dc, err := scaler.dcClient.DeploymentConfigs(namespace).Get(name)
 			if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func (scaler *DeploymentConfigScaler) Scale(namespace, name string, newSize uint`
`39`	`39`	`}`
`40`	`40`	`cond := kubectl.ScaleCondition(scaler, preconditions, namespace, name, newSize)`
`41`	`41`	`if err := wait.Poll(retry.Interval, retry.Timeout, cond); err != nil {`
`42`		`- if scaleErr := err.(kubectl.ControllerScaleError); kerrors.IsNotFound(scaleErr.ActualError) {`
	`42`	`+ if scaleErr, ok := err.(kubectl.ControllerScaleError); ok && kerrors.IsNotFound(scaleErr.ActualError) {`
`43`	`43`	`glog.Infof("No deployment found for dc/%s. Scaling the deployment configuration template...", name)`
`44`	`44`	`dc, err := scaler.dcClient.DeploymentConfigs(namespace).Get(name)`
`45`	`45`	`if err != nil {`