hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject git commit: HADOOP-10925 Compilation fails in native link0 function on Windows.
Date Tue, 09 Sep 2014 15:25:27 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 e73601860 -> b601e69d9


HADOOP-10925 Compilation fails in native link0 function on Windows.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b601e69d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b601e69d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b601e69d

Branch: refs/heads/branch-2
Commit: b601e69d9d749df08dfb48e2781a9c712b17a658
Parents: e736018
Author: Chris Nauroth <cnauroth@apache.org>
Authored: Sat Aug 2 15:02:23 2014 +0000
Committer: Steve Loughran <stevel@apache.org>
Committed: Tue Sep 9 16:25:14 2014 +0100

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt                   | 3 +++
 .../src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/b601e69d/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 450053d..89e3bb8 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -337,6 +337,9 @@ Release 2.6.0 - UNRELEASED
     HADOOP-10937. Need to set version name correctly before decrypting EEK.
     (Arun Suresh via wang)
 
+    HADOOP-10925. Compilation fails in native link0 function on Windows.
+    (cnauroth)
+
     HADOOP-10918. JMXJsonServlet fails when used within Tomcat. (tucu)
 
     HADOOP-10939. Fix TestKeyProviderFactory testcases to use default 128 bit

http://git-wip-us.apache.org/repos/asf/hadoop/blob/b601e69d/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
index 2834d6d..d8538c8 100644
--- a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
+++ b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
@@ -1114,7 +1114,7 @@ done:
   if (!src) goto done; // exception was thrown
   dst = (LPCTSTR) (*env)->GetStringChars(env, jdst, NULL);
   if (!dst) goto done; // exception was thrown
-  if (!CreateHardLink(dst, src)) {
+  if (!CreateHardLink(dst, src, NULL)) {
     throw_ioe(env, GetLastError());
   }
 


Mime
View raw message