File tree Expand file tree Collapse file tree 2 files changed +4
-24
lines changed Expand file tree Collapse file tree 2 files changed +4
-24
lines changed Original file line number Diff line number Diff line change @@ -1277,14 +1277,7 @@ func (impl CiCdPipelineOrchestratorImpl) CreateMaterials(createMaterialRequest *
1277
1277
if err != nil {
1278
1278
return nil , err
1279
1279
}
1280
- defer func () {
1281
- if err != nil {
1282
- err := tx .Rollback ()
1283
- if err != nil {
1284
- impl .logger .Errorw ("error in rollback Create material" , "err" , err )
1285
- }
1286
- }
1287
- }()
1280
+ defer tx .Rollback ()
1288
1281
existingMaterials , err := impl .materialRepository .FindByAppId (createMaterialRequest .AppId )
1289
1282
if err != nil {
1290
1283
impl .logger .Errorw ("err" , "err" , err )
@@ -1335,14 +1328,7 @@ func (impl CiCdPipelineOrchestratorImpl) UpdateMaterial(updateMaterialDTO *bean.
1335
1328
if err != nil {
1336
1329
return nil , err
1337
1330
}
1338
- defer func () {
1339
- if err != nil {
1340
- err := tx .Rollback ()
1341
- if err != nil {
1342
- impl .logger .Errorw ("error in rollback Update material" , "err" , err )
1343
- }
1344
- }
1345
- }()
1331
+ defer tx .Rollback ()
1346
1332
updatedMaterial , err := impl .updateMaterial (updateMaterialDTO , tx )
1347
1333
if err != nil {
1348
1334
impl .logger .Errorw ("err" , "err" , err )
Original file line number Diff line number Diff line change @@ -129,14 +129,8 @@ func (impl *CiMaterialConfigServiceImpl) DeleteMaterial(request *bean.UpdateMate
129
129
if err != nil {
130
130
return err
131
131
}
132
- defer func () {
133
- if err != nil {
134
- err := tx .Rollback ()
135
- if err != nil {
136
- impl .logger .Errorw ("error in rollback " , "err" , err )
137
- }
138
- }
139
- }()
132
+
133
+ defer tx .Rollback ()
140
134
141
135
err = impl .materialRepo .MarkMaterialDeleted (existingMaterial , tx )
142
136
if err != nil {
You can’t perform that action at this time.
0 commit comments