Browse code

prevent nil panic

deads2k authored on 2015/07/28 02:53:55
Showing 2 changed files
... ...
@@ -53,11 +53,18 @@ func (s *storage) ListClusterRoles(ctx kapi.Context, label labels.Selector, fiel
53 53
 
54 54
 func (s *storage) CreateClusterRole(ctx kapi.Context, node *authorizationapi.ClusterRole) (*authorizationapi.ClusterRole, error) {
55 55
 	obj, err := s.Create(ctx, node)
56
+	if err != nil {
57
+		return nil, err
58
+	}
59
+
56 60
 	return obj.(*authorizationapi.ClusterRole), err
57 61
 }
58 62
 
59 63
 func (s *storage) UpdateClusterRole(ctx kapi.Context, node *authorizationapi.ClusterRole) (*authorizationapi.ClusterRole, bool, error) {
60 64
 	obj, created, err := s.Update(ctx, node)
65
+	if err != nil {
66
+		return nil, created, err
67
+	}
61 68
 	return obj.(*authorizationapi.ClusterRole), created, err
62 69
 }
63 70
 
... ...
@@ -58,11 +58,17 @@ func (s *storage) ListRoleBindings(ctx kapi.Context, label labels.Selector, fiel
58 58
 
59 59
 func (s *storage) CreateRoleBinding(ctx kapi.Context, node *authorizationapi.RoleBinding) (*authorizationapi.RoleBinding, error) {
60 60
 	obj, err := s.Create(ctx, node)
61
+	if err != nil {
62
+		return nil, err
63
+	}
61 64
 	return obj.(*authorizationapi.RoleBinding), err
62 65
 }
63 66
 
64 67
 func (s *storage) UpdateRoleBinding(ctx kapi.Context, node *authorizationapi.RoleBinding) (*authorizationapi.RoleBinding, bool, error) {
65 68
 	obj, created, err := s.Update(ctx, node)
69
+	if err != nil {
70
+		return nil, created, err
71
+	}
66 72
 	return obj.(*authorizationapi.RoleBinding), created, err
67 73
 }
68 74