Merge pull request src-d#223 from camathieu/1.2.1

Charles-Antoine Mathieu · web-flow · commit b41271324c19 · 2017-10-19T10:43:21.000+02:00
fix error shadowing in addFile preprocessor
diff --git a/server/handlers/addFile.go b/server/handlers/addFile.go
@@ -282,8 +282,8 @@ func preprocessor(ctx *juliet.Context, file io.Reader, preprocessWriter io.Write
 		}
 	}
 
-	err = preprocessWriter.Close()
-	if err != nil {
+	errClose := preprocessWriter.Close()
+	if errClose != nil {
 		log.Warningf("Unable to close preprocessWriter : %s", err)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -282,8 +282,8 @@ func preprocessor(ctx *juliet.Context, file io.Reader, preprocessWriter io.Write`
`282`	`282`	`}`
`283`	`283`	`}`
`284`	`284`
`285`		`- err = preprocessWriter.Close()`
`286`		`- if err != nil {`
	`285`	`+ errClose := preprocessWriter.Close()`
	`286`	`+ if errClose != nil {`
`287`	`287`	`log.Warningf("Unable to close preprocessWriter : %s", err)`
`288`	`288`	`}`
`289`	`289`