You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zj...@apache.org on 2015/02/25 18:24:17 UTC
[34/50] [abbrv] hadoop git commit: HADOOP-11619. FTPFileSystem should
override getDefaultPort. (Brahma Reddy Battula via gera)
HADOOP-11619. FTPFileSystem should override getDefaultPort. (Brahma Reddy Battula via gera)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1dba5727
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1dba5727
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1dba5727
Branch: refs/heads/YARN-2928
Commit: 1dba57271fa56a7383139deb0b89a61c58eedf25
Parents: faaddb6
Author: Gera Shegalov <ge...@apache.org>
Authored: Mon Feb 23 21:05:59 2015 -0800
Committer: Gera Shegalov <ge...@apache.org>
Committed: Mon Feb 23 21:05:59 2015 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 ++
.../org/apache/hadoop/fs/ftp/FTPFileSystem.java | 10 ++++++
.../apache/hadoop/fs/ftp/TestFTPFileSystem.java | 33 ++++++++++++++++++++
3 files changed, 46 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1dba5727/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index e51f251..68d686e 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -995,6 +995,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-8642. Document that io.native.lib.available only controls native bz2
and zlib compression codecs. (aajisaka)
+ HADOOP-11619. FTPFileSystem should override getDefaultPort.
+ (Brahma Reddy Battula via gera)
+
Release 2.6.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1dba5727/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FTPFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FTPFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FTPFileSystem.java
index 47fb25c..d429c42 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FTPFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FTPFileSystem.java
@@ -81,6 +81,16 @@ public class FTPFileSystem extends FileSystem {
return "ftp";
}
+ /**
+ * Get the default port for this FTPFileSystem.
+ *
+ * @return the default port
+ */
+ @Override
+ protected int getDefaultPort() {
+ return FTP.DEFAULT_PORT;
+ }
+
@Override
public void initialize(URI uri, Configuration conf) throws IOException { // get
super.initialize(uri, conf);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1dba5727/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/ftp/TestFTPFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/ftp/TestFTPFileSystem.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/ftp/TestFTPFileSystem.java
new file mode 100644
index 0000000..0ce2a9b
--- /dev/null
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/ftp/TestFTPFileSystem.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.fs.ftp;
+
+import org.apache.commons.net.ftp.FTP;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestFTPFileSystem {
+
+ @Test
+ public void testFTPDefaultPort() throws Exception {
+ FTPFileSystem ftp = new FTPFileSystem();
+ Assert.assertEquals(FTP.DEFAULT_PORT, ftp.getDefaultPort());
+ }
+
+}
\ No newline at end of file