Merge pull request #88 from Revolyssup/fixopenfile

Fix skipped file closing
meshery · Jul 13, 2022 · ba4b412 · ba4b412
2 parents 2f78661 + 57d984c
commit ba4b412
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/adapter/adapter.go b/adapter/adapter.go
@@ -49,8 +49,8 @@ type Adapter struct {
 	mx                sync.Mutex
 }
 
-func (a *Adapter) SetChannel(hchan *chan interface{}) {
-	a.mx.Lock()
-	defer a.mx.Unlock()
-	a.Channel = hchan
+func (h *Adapter) SetChannel(hchan *chan interface{}) {
+	h.mx.Lock()
+	defer h.mx.Unlock()
+	h.Channel = hchan
 }
diff --git a/adapter/oam.go b/adapter/oam.go
@@ -104,14 +104,13 @@ func (or *OAMRegistrant) Register() error {
 		if err != nil {
 			return ErrOpenOAMDefintionFile(err)
 		}
-		defer func() {
-			_ = definition.Close()
-		}()
 
 		definitionMap := map[string]interface{}{}
 		if err := json.NewDecoder(definition).Decode(&definitionMap); err != nil {
+			_ = definition.Close()
 			return ErrJSONMarshal(err)
 		}
+		_ = definition.Close()
 		ord.OAMDefinition = definitionMap
 
 		schema, err := ioutil.ReadFile(dpath.OAMRefSchemaPath)