Skip to content

Simplify conditions and avoid extra compute. #17

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
arturobernalg wants to merge 1 commit into from
Closed

Simplify conditions and avoid extra compute. #17

Show file tree
Hide file tree
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
6 changes: 1 addition & 5 deletions core/src/main/java/org/apache/ftpserver/command/impl/MD5.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,7 @@ public void execute(final FtpIoSession session,
// reset state variables
session.resetState();

boolean isMMD5 = false;

if ("MMD5".equals(request.getCommand())) {
isMMD5 = true;
}
boolean isMMD5 = "MMD5".equals(request.getCommand());

// print file information
String argument = request.getArgument();
Expand Down
12 changes: 3 additions & 9 deletions core/src/main/java/org/apache/ftpserver/command/impl/OPTS_MLST.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,9 @@ public void execute(final FtpIoSession session,
}
// set the list types
String[] validatedTypes = validateSelectedTypes(types);
if (validatedTypes != null) {
session.setAttribute("MLST.types", validatedTypes);
session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_200_COMMAND_OKAY, "OPTS.MLST", listTypes));
} else {
session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS,
"OPTS.MLST", listTypes));
}
session.setAttribute("MLST.types", validatedTypes);
session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_200_COMMAND_OKAY, "OPTS.MLST", listTypes));
}

private String[] validateSelectedTypes(final String types[]) {
Expand Down
3 changes: 1 addition & 2 deletions core/src/main/java/org/apache/ftpserver/filesystem/nativefs/NativeFileSystemFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,8 @@ public FileSystemView createFileSystemView(User user) throws FtpException {
}
}

FileSystemView fsView = new NativeFileSystemView(user,
return new NativeFileSystemView(user,
caseInsensitive);
return fsView;
}
}

Expand Down
6 changes: 1 addition & 5 deletions core/src/main/java/org/apache/ftpserver/impl/IODataConnectionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,11 +432,7 @@ public synchronized boolean isTimeout(final long currTime) {
}

// idle time is within limit - not a timeout
if ((currTime - requestTime) < maxIdleTime) {
return false;
}

return true;
return (currTime - requestTime) >= maxIdleTime;
}

/**
Expand Down