From b601e69d9d749df08dfb48e2781a9c712b17a658 Mon Sep 17 00:00:00 2001 From: Chris Nauroth Date: Sat, 2 Aug 2014 15:02:23 +0000 Subject: [PATCH] HADOOP-10925 Compilation fails in native link0 function on Windows. --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 450053d2983..89e3bb878ea 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 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 2834d6d2245..d8538c8b0be 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()); }