This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
The following commit(s) were added to refs/heads/master by this push:
new 7b7f61c No need to nest in else.
7b7f61c is described below
commit 7b7f61c3b99f0bb9827ad4c361421f8df1d9591b
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Mar 5 15:04:43 2021 -0500
No need to nest in else.
---
.../vfs2/provider/webdav/ExceptionConverter.java | 3 +-
.../vfs2/provider/webdav4/ExceptionConverter.java | 3 +-
.../commons/vfs2/provider/smb/SmbFileObject.java | 9 ++--
.../provider/smb/test/SmbProviderTestCase.java | 3 +-
.../commons/vfs2/auth/StaticUserAuthenticator.java | 9 ++--
.../commons/vfs2/impl/DefaultFileMonitor.java | 2 +-
.../commons/vfs2/provider/AbstractFileName.java | 18 +++++---
.../commons/vfs2/provider/AbstractFileObject.java | 3 +-
.../commons/vfs2/provider/DelegateFileObject.java | 6 +--
.../commons/vfs2/provider/ftp/FtpFileObject.java | 9 ++--
.../commons/vfs2/provider/http/HttpFileObject.java | 6 +--
.../vfs2/provider/http4/Http4FileObject.java | 6 +--
.../vfs2/provider/http5/Http5FileObject.java | 6 +--
.../commons/vfs2/provider/jar/JarFileSystem.java | 51 ++++++++++++++--------
.../commons/vfs2/provider/tar/TarFileSystem.java | 3 +-
.../vfs2/provider/url/UrlFileNameParser.java | 5 +--
.../main/java/org/apache/commons/vfs2/util/Os.java | 15 ++++---
.../apache/commons/vfs2/util/RandomAccessMode.java | 3 +-
.../sftp/AbstractSftpProviderTestCase.java | 3 +-
.../vfs2/provider/zip/ParseXmlInZipTestCase.java | 7 ++-
20 files changed, 100 insertions(+), 70 deletions(-)
diff --git
a/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java
b/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java
index 05c1fa8..c760409 100644
---
a/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java
+++
b/commons-vfs2-jackrabbit1/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java
@@ -58,7 +58,8 @@ public final class ExceptionConverter {
final Object o = excConstr.newInstance(msg);
if (o instanceof FileSystemException) {
return (FileSystemException) o;
- } else if (o instanceof Exception) {
+ }
+ if (o instanceof Exception) {
return new FileSystemException(msg,
(Exception) o);
}
}
diff --git
a/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/ExceptionConverter.java
b/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/ExceptionConverter.java
index 5bccfb4..707bdf9 100644
---
a/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/ExceptionConverter.java
+++
b/commons-vfs2-jackrabbit2/src/main/java/org/apache/commons/vfs2/provider/webdav4/ExceptionConverter.java
@@ -52,7 +52,8 @@ public final class ExceptionConverter {
final Object o = excConstr.newInstance(msg);
if (o instanceof FileSystemException) {
return (FileSystemException) o;
- } else if (o instanceof Exception) {
+ }
+ if (o instanceof Exception) {
return new FileSystemException(msg,
(Exception) o);
}
}
diff --git
a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileObject.java
b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileObject.java
index 74abcb2..d28fe28 100644
---
a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileObject.java
+++
b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileObject.java
@@ -116,9 +116,11 @@ public class SmbFileObject extends
AbstractFileObject<SmbFileSystem> {
protected FileType doGetType() throws Exception {
if (!file.exists()) {
return FileType.IMAGINARY;
- } else if (file.isDirectory()) {
+ }
+ if (file.isDirectory()) {
return FileType.FOLDER;
- } else if (file.isFile()) {
+ }
+ if (file.isFile()) {
return FileType.FILE;
}
@@ -194,7 +196,8 @@ public class SmbFileObject extends
AbstractFileObject<SmbFileSystem> {
} catch (final SmbException e) {
if (e.getNtStatus() == NtStatus.NT_STATUS_NO_SUCH_FILE) {
throw new
org.apache.commons.vfs2.FileNotFoundException(getName());
- } else if (file.isDirectory()) {
+ }
+ if (file.isDirectory()) {
throw new FileTypeHasNoContentException(getName());
}
diff --git
a/commons-vfs2-sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/SmbProviderTestCase.java
b/commons-vfs2-sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/SmbProviderTestCase.java
index bea0fc2..c562b4c 100644
---
a/commons-vfs2-sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/SmbProviderTestCase.java
+++
b/commons-vfs2-sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/SmbProviderTestCase.java
@@ -35,9 +35,8 @@ public class SmbProviderTestCase extends
AbstractProviderTestConfig implements P
public static Test suite() throws Exception {
if (System.getProperty(TEST_URI) != null) {
return new ProviderTestSuite(new SmbProviderTestCase());
- } else {
- return notConfigured(SmbProviderTestCase.class);
}
+ return notConfigured(SmbProviderTestCase.class);
}
/**
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/auth/StaticUserAuthenticator.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/auth/StaticUserAuthenticator.java
index 4087029..8d48cac 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/auth/StaticUserAuthenticator.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/auth/StaticUserAuthenticator.java
@@ -120,11 +120,7 @@ public class StaticUserAuthenticator implements
UserAuthenticator, Comparable<St
}
private int compareStringOrNull(final String thisString, final String
otherString) {
- if (thisString == null) {
- if (otherString != null) {
- return -1;
- }
- } else {
+ if (thisString != null) {
if (otherString == null) {
return 1;
}
@@ -132,6 +128,9 @@ public class StaticUserAuthenticator implements
UserAuthenticator, Comparable<St
final int result = thisString.compareTo(otherString);
return result;
}
+ if (otherString != null) {
+ return -1;
+ }
return 0;
}
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java
index 69a6d20..f2658b8 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java
@@ -235,7 +235,7 @@ public class DefaultFileMonitor implements Runnable,
FileMonitor {
* @param delay The delay period.
*/
public void setDelay(final long delay) {
- this.delay = delay > 0 ? delay : DEFAULT_DELAY;
+ this.delay = delay > 0 ? delay : DEFAULT_DELAY;
}
/**
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
index 7ed948a..ec0c101 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
@@ -191,7 +191,8 @@ public abstract class AbstractFileName implements FileName {
if (idx == -1 || idx == getPath().length() - 1) {
// No parent
return null;
- } else if (idx == 0) {
+ }
+ if (idx == 0) {
// Root is the parent
parentPath = SEPARATOR;
} else {
@@ -305,7 +306,8 @@ public abstract class AbstractFileName implements FileName {
// Deal with root
if (basePathLen == 1 && pathLen == 1) {
return ".";
- } else if (basePathLen == 1) {
+ }
+ if (basePathLen == 1) {
return path.substring(1);
}
@@ -317,7 +319,8 @@ public abstract class AbstractFileName implements FileName {
if (pos == basePathLen && pos == pathLen) {
// Same names
return ".";
- } else if (pos == basePathLen && pos < pathLen && path.charAt(pos) ==
SEPARATOR_CHAR) {
+ }
+ if (pos == basePathLen && pos < pathLen && path.charAt(pos) ==
SEPARATOR_CHAR) {
// A descendent of the base path
return path.substring(pos + 1);
}
@@ -513,11 +516,14 @@ public abstract class AbstractFileName implements
FileName {
if (scope == NameScope.CHILD) {
return path.length() != baseLen && (baseLen <= 1 ||
path.charAt(baseLen) == SEPARATOR_CHAR)
&& path.indexOf(SEPARATOR_CHAR, baseLen + 1) == -1;
- } else if (scope == NameScope.DESCENDENT) {
+ }
+ if (scope == NameScope.DESCENDENT) {
return path.length() != baseLen && (baseLen <= 1 ||
path.charAt(baseLen) == SEPARATOR_CHAR);
- } else if (scope == NameScope.DESCENDENT_OR_SELF) {
+ }
+ if (scope == NameScope.DESCENDENT_OR_SELF) {
return baseLen <= 1 || path.length() <= baseLen ||
path.charAt(baseLen) == SEPARATOR_CHAR;
- } else if (scope != NameScope.FILE_SYSTEM) {
+ }
+ if (scope != NameScope.FILE_SYSTEM) {
throw new IllegalArgumentException();
}
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
index 1a6f710..23cae97 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
@@ -1104,7 +1104,8 @@ public abstract class AbstractFileObject<AFS extends
AbstractFileSystem> impleme
// honor the new doListChildren contract
// return null;
throw new FileNotFolderException(fileName);
- } else if (files.length == 0) {
+ }
+ if (files.length == 0) {
// No children
children = FileName.EMPTY_ARRAY;
} else {
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DelegateFileObject.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DelegateFileObject.java
index 7aaef44..a5fb43c 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DelegateFileObject.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DelegateFileObject.java
@@ -123,11 +123,11 @@ public class DelegateFileObject<AFS extends
AbstractFileSystem> extends Abstract
protected FileType doGetType() throws FileSystemException {
if (file != null) {
return file.getType();
- } else if (children.isEmpty()) {
+ }
+ if (children.isEmpty()) {
return FileType.IMAGINARY;
- } else {
- return FileType.FOLDER;
}
+ return FileType.FOLDER;
}
/**
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
index d8d5232..01facb5 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
@@ -369,11 +369,14 @@ public class FtpFileObject extends
AbstractFileObject<FtpFileSystem> {
if (this.ftpFile == UNKNOWN) {
return FileType.IMAGINARY;
- } else if (this.ftpFile.isDirectory()) {
+ }
+ if (this.ftpFile.isDirectory()) {
return FileType.FOLDER;
- } else if (this.ftpFile.isFile()) {
+ }
+ if (this.ftpFile.isFile()) {
return FileType.FILE;
- } else if (this.ftpFile.isSymbolicLink()) {
+ }
+ if (this.ftpFile.isSymbolicLink()) {
final FileObject linkDest = getLinkDestination();
// VFS-437: We need to check if the symbolic link links back
to the symbolic link itself
if (this.isCircular(linkDest)) {
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileObject.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileObject.java
index 890b6e2..0bbf6fe 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileObject.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http/HttpFileObject.java
@@ -169,11 +169,11 @@ public class HttpFileObject<FS extends HttpFileSystem>
extends AbstractFileObjec
if (status == HttpURLConnection.HTTP_OK
|| status == HttpURLConnection.HTTP_BAD_METHOD /* method is
bad, but resource exist */) {
return FileType.FILE;
- } else if (status == HttpURLConnection.HTTP_NOT_FOUND || status ==
HttpURLConnection.HTTP_GONE) {
+ }
+ if (status == HttpURLConnection.HTTP_NOT_FOUND || status ==
HttpURLConnection.HTTP_GONE) {
return FileType.IMAGINARY;
- } else {
- throw new FileSystemException("vfs.provider.http/head.error",
getName(), Integer.valueOf(status));
}
+ throw new FileSystemException("vfs.provider.http/head.error",
getName(), Integer.valueOf(status));
}
@Override
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileObject.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileObject.java
index b152a4f..694a954 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileObject.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4FileObject.java
@@ -159,11 +159,11 @@ public class Http4FileObject<FS extends Http4FileSystem>
extends AbstractFileObj
if (status == HttpStatus.SC_OK
|| status == HttpStatus.SC_METHOD_NOT_ALLOWED /* method is not
allowed, but resource exist */) {
return FileType.FILE;
- } else if (status == HttpStatus.SC_NOT_FOUND || status ==
HttpStatus.SC_GONE) {
+ }
+ if (status == HttpStatus.SC_NOT_FOUND || status == HttpStatus.SC_GONE)
{
return FileType.IMAGINARY;
- } else {
- throw new FileSystemException("vfs.provider.http/head.error",
getName(), Integer.valueOf(status));
}
+ throw new FileSystemException("vfs.provider.http/head.error",
getName(), Integer.valueOf(status));
}
@Override
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileObject.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileObject.java
index f78dbc3..541be1f 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileObject.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5FileObject.java
@@ -160,11 +160,11 @@ public class Http5FileObject<FS extends Http5FileSystem>
extends AbstractFileObj
if (status == HttpStatus.SC_OK
|| status == HttpStatus.SC_METHOD_NOT_ALLOWED /* method is not
allowed, but resource exist */) {
return FileType.FILE;
- } else if (status == HttpStatus.SC_NOT_FOUND || status ==
HttpStatus.SC_GONE) {
+ }
+ if (status == HttpStatus.SC_NOT_FOUND || status == HttpStatus.SC_GONE)
{
return FileType.IMAGINARY;
- } else {
- throw new FileSystemException("vfs.provider.http/head.error",
getName(), Integer.valueOf(status));
}
+ throw new FileSystemException("vfs.provider.http/head.error",
getName(), Integer.valueOf(status));
}
@Override
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileSystem.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileSystem.java
index b6d2735..b11af1f 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileSystem.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileSystem.java
@@ -104,41 +104,56 @@ public class JarFileSystem extends ZipFileSystem {
Name lookupName(final String attrName) {
if (Name.CLASS_PATH.toString().equals(attrName)) {
return Name.CLASS_PATH;
- } else if (Name.CONTENT_TYPE.toString().equals(attrName)) {
+ }
+ if (Name.CONTENT_TYPE.toString().equals(attrName)) {
return Name.CONTENT_TYPE;
- } else if (Name.EXTENSION_INSTALLATION.toString().equals(attrName)) {
+ }
+ if (Name.EXTENSION_INSTALLATION.toString().equals(attrName)) {
return Name.EXTENSION_INSTALLATION;
- } else if (Name.EXTENSION_LIST.toString().equals(attrName)) {
+ }
+ if (Name.EXTENSION_LIST.toString().equals(attrName)) {
return Name.EXTENSION_LIST;
- } else if (Name.EXTENSION_NAME.toString().equals(attrName)) {
+ }
+ if (Name.EXTENSION_NAME.toString().equals(attrName)) {
return Name.EXTENSION_NAME;
- } else if (Name.IMPLEMENTATION_TITLE.toString().equals(attrName)) {
+ }
+ if (Name.IMPLEMENTATION_TITLE.toString().equals(attrName)) {
return Name.IMPLEMENTATION_TITLE;
- } else if (Name.IMPLEMENTATION_URL.toString().equals(attrName)) {
+ }
+ if (Name.IMPLEMENTATION_URL.toString().equals(attrName)) {
return Name.IMPLEMENTATION_URL;
- } else if (Name.IMPLEMENTATION_VENDOR.toString().equals(attrName)) {
+ }
+ if (Name.IMPLEMENTATION_VENDOR.toString().equals(attrName)) {
return Name.IMPLEMENTATION_VENDOR;
- } else if (Name.IMPLEMENTATION_VENDOR_ID.toString().equals(attrName)) {
+ }
+ if (Name.IMPLEMENTATION_VENDOR_ID.toString().equals(attrName)) {
return Name.IMPLEMENTATION_VENDOR_ID;
- } else if (Name.IMPLEMENTATION_VERSION.toString().equals(attrName)) {
+ }
+ if (Name.IMPLEMENTATION_VERSION.toString().equals(attrName)) {
return Name.IMPLEMENTATION_VENDOR;
- } else if (Name.MAIN_CLASS.toString().equals(attrName)) {
+ }
+ if (Name.MAIN_CLASS.toString().equals(attrName)) {
return Name.MAIN_CLASS;
- } else if (Name.MANIFEST_VERSION.toString().equals(attrName)) {
+ }
+ if (Name.MANIFEST_VERSION.toString().equals(attrName)) {
return Name.MANIFEST_VERSION;
- } else if (Name.SEALED.toString().equals(attrName)) {
+ }
+ if (Name.SEALED.toString().equals(attrName)) {
return Name.SEALED;
- } else if (Name.SIGNATURE_VERSION.toString().equals(attrName)) {
+ }
+ if (Name.SIGNATURE_VERSION.toString().equals(attrName)) {
return Name.SIGNATURE_VERSION;
- } else if (Name.SPECIFICATION_TITLE.toString().equals(attrName)) {
+ }
+ if (Name.SPECIFICATION_TITLE.toString().equals(attrName)) {
return Name.SPECIFICATION_TITLE;
- } else if (Name.SPECIFICATION_VENDOR.toString().equals(attrName)) {
+ }
+ if (Name.SPECIFICATION_VENDOR.toString().equals(attrName)) {
return Name.SPECIFICATION_VENDOR;
- } else if (Name.SPECIFICATION_VERSION.toString().equals(attrName)) {
+ }
+ if (Name.SPECIFICATION_VERSION.toString().equals(attrName)) {
return Name.SPECIFICATION_VERSION;
- } else {
- return new Name(attrName);
}
+ return new Name(attrName);
}
/**
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java
index 5b16b13..3fbc4d1 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java
@@ -95,7 +95,8 @@ public class TarFileSystem extends AbstractFileSystem {
try {
if ("tgz".equalsIgnoreCase(getRootName().getScheme())) {
return new TarArchiveInputStream(new GZIPInputStream(new
FileInputStream(file)));
- } else if ("tbz2".equalsIgnoreCase(getRootName().getScheme())) {
+ }
+ if ("tbz2".equalsIgnoreCase(getRootName().getScheme())) {
return new TarArchiveInputStream(
Bzip2FileObject.wrapInputStream(file.getAbsolutePath(),
new FileInputStream(file)));
}
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java
index 5942296..fe8c3ba 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java
@@ -103,11 +103,10 @@ public class UrlFileNameParser extends
AbstractFileNameParser {
continue;
}
} else if (state == 1) {
- if (c == '/') {
- nuofSlash++;
- } else {
+ if (c != '/') {
return nuofSlash;
}
+ nuofSlash++;
}
}
return nuofSlash;
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/Os.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/Os.java
index 3ab8f68..0e64918 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/Os.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/Os.java
@@ -261,19 +261,22 @@ public final class Os {
return OS_FAMILY_WINNT;
}
return OS_FAMILY_WIN9X;
- } else if (OS_NAME.contains("os/2")) {
+ }
+ if (OS_NAME.contains("os/2")) {
return OS_FAMILY_OS2;
- } else if (OS_NAME.contains("netware")) {
+ }
+ if (OS_NAME.contains("netware")) {
return OS_FAMILY_NETWARE;
- } else if (OS_NAME.contains("mac")) {
+ }
+ if (OS_NAME.contains("mac")) {
if (OS_NAME.endsWith("x")) {
return OS_FAMILY_OSX;
}
return OS_FAMILY_MAC;
- } else if (PATH_SEP.equals(":")) {
+ }
+ if (PATH_SEP.equals(":")) {
return OS_FAMILY_UNIX;
- } else {
- return null;
}
+ return null;
}
}
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/RandomAccessMode.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/RandomAccessMode.java
index 6165e43..ab9c6e4 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/RandomAccessMode.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/RandomAccessMode.java
@@ -57,7 +57,8 @@ public enum RandomAccessMode {
return "rw"; // NON-NLS
}
return "r"; // NON-NLS
- } else if (requestWrite()) {
+ }
+ if (requestWrite()) {
return "w"; // NON-NLS
}
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/AbstractSftpProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/AbstractSftpProviderTestCase.java
index ab2e07c..2406ca4 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/AbstractSftpProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/AbstractSftpProviderTestCase.java
@@ -367,9 +367,8 @@ abstract class AbstractSftpProviderTestCase extends
AbstractProviderTestConfig {
if (command.equals("id -G") || command.equals("id -u")) {
if (isExecChannelClosed) {
throw new IOException();
- } else {
- new PrintStream(out).println(0);
}
+ new PrintStream(out).println(0);
} else if (NETCAT_COMMAND.matcher(command).matches()) {
final Matcher matcher =
NETCAT_COMMAND.matcher(command);
matcher.matches();
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ParseXmlInZipTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ParseXmlInZipTestCase.java
index 9994c0c..51ed259 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ParseXmlInZipTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ParseXmlInZipTestCase.java
@@ -66,13 +66,12 @@ public class ParseXmlInZipTestCase {
"http://www.w3.org/2001/XMLSchema";);
@SuppressWarnings("resource")
final FileObject schema =
containerFile.resolveFile(pathToXsdInZip);
- if (schema.exists()) {
-
documentBuilderFactory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaSource";,
- schema.getContent().getInputStream());
- } else {
+ if (!schema.exists()) {
schema.close();
throw new FileNotFoundException(schema.toString());
}
+
documentBuilderFactory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaSource";,
+ schema.getContent().getInputStream());
}
DocumentBuilder documentBuilder = null;
try {
