You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2018/07/15 22:23:46 UTC
[4/6] flink git commit: [hotfix] [core] Fix checkstyle workaround in
FileSystem
[hotfix] [core] Fix checkstyle workaround in FileSystem
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f2475989
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f2475989
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f2475989
Branch: refs/heads/master
Commit: f247598982fd82aeb2c609434cf875daef3ffabb
Parents: 548e9ed
Author: Stephan Ewen <se...@apache.org>
Authored: Fri Jul 13 12:33:29 2018 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Jul 15 23:18:56 2018 +0200
----------------------------------------------------------------------
.../main/java/org/apache/flink/core/fs/FileSystem.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/f2475989/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
index 8698595..27255f9 100644
--- a/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
+++ b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
@@ -229,9 +229,7 @@ public abstract class FileSystem {
/** The default filesystem scheme to be used, configured during process-wide initialization.
* This value defaults to the local file systems scheme {@code 'file:///'} or {@code 'file:/'}. */
- //CHECKSTYLE.OFF: StaticVariableName
- private static URI DEFAULT_SCHEME;
- //CHECKSTYLE.ON: StaticVariableName
+ private static URI defaultScheme;
// ------------------------------------------------------------------------
// Initialization
@@ -275,11 +273,11 @@ public abstract class FileSystem {
// also read the default file system scheme
final String stringifiedUri = config.getString(CoreOptions.DEFAULT_FILESYSTEM_SCHEME, null);
if (stringifiedUri == null) {
- DEFAULT_SCHEME = null;
+ defaultScheme = null;
}
else {
try {
- DEFAULT_SCHEME = new URI(stringifiedUri);
+ defaultScheme = new URI(stringifiedUri);
}
catch (URISyntaxException e) {
throw new IllegalConfigurationException("The default file system scheme ('" +
@@ -427,7 +425,7 @@ public abstract class FileSystem {
* @return The default file system URI
*/
public static URI getDefaultFsUri() {
- return DEFAULT_SCHEME != null ? DEFAULT_SCHEME : LocalFileSystem.getLocalFsURI();
+ return defaultScheme != null ? defaultScheme : LocalFileSystem.getLocalFsURI();
}
// ------------------------------------------------------------------------