Skip to content

Rename internal errorOccured -> errorOccurred in make-middleware #1393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
SAY-5 wants to merge 1 commit into from
+5 −5
Closed

Rename internal errorOccured -> errorOccurred in make-middleware #1393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib/make-middleware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function makeMiddleware (setup) {
var appender = null
var isDone = false
var readFinished = false
var errorOccured = false
var errorOccurred = false
var pendingWrites = new Counter()
var uploadedFiles = []

Expand Down Expand Up @@ -70,12 +70,12 @@ function makeMiddleware (setup) {
}

function indicateDone () {
if (readFinished && pendingWrites.isZero() && !errorOccured) done()
if (readFinished && pendingWrites.isZero() && !errorOccurred) done()
}

function abortWithError (uploadError, skipPendingWait) {
if (errorOccured) return
errorOccured = true
if (errorOccurred) return
errorOccurred = true

function finishAbort () {
function remove (file, cb) {
Expand Down Expand Up @@ -181,7 +181,7 @@ function makeMiddleware (setup) {
var placeholder = appender.insertPlaceholder(file)

fileFilter(req, file, function (err, includeFile) {
if (errorOccured) {
if (errorOccurred) {
appender.removePlaceholder(placeholder)
return fileStream.resume()
}
Expand Down