Merge pull request #243 from apache/govet-fix

Fixing some govet findings

pkg/apis/camel/v1alpha1/types_support.go

@@ -98,7 +98,6 @@ func NewIntegrationContextList() IntegrationContextList {
 	}
 }
 
-
 // TraitProfileByName returns the trait profile corresponding to the given name (case insensitive)
 func TraitProfileByName(name string) TraitProfile {
 	for _, p := range allTraitProfiles {
@@ -107,4 +106,4 @@ func TraitProfileByName(name string) TraitProfile {
 		}
 	}
 	return ""
-}
+}

pkg/client/cmd/run.go

@@ -394,12 +394,10 @@ func toJSON(value runtime.Object) ([]byte, error) {
 	u, err := k8sutil.UnstructuredFromRuntimeObject(value)
 	if err != nil {
 		return nil, fmt.Errorf("error creating unstructured data: %v", err)
-		return nil, err
 	}
 	data, err := runtime.Encode(unstructured.UnstructuredJSONScheme, u)
 	if err != nil {
 		return nil, fmt.Errorf("error marshalling to json: %v", err)
-		return nil, err
 	}
 	return data, nil
 }

pkg/util/watch/watch.go

@@ -145,6 +145,4 @@ func HandleStateChanges(ctx context.Context, integration *v1alpha1.Integration,
 			}
 		}
 	}
-
-	return nil
 }