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 el...@apache.org on 2012/09/17 21:28:14 UTC
svn commit: r1386783 - in
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src:
CMakeLists.txt main/java/org/apache/hadoop/util/ExitUtil.java
Author: eli
Date: Mon Sep 17 19:28:14 2012
New Revision: 1386783
URL: http://svn.apache.org/viewvc?rev=1386783&view=rev
Log:
Revert previous commit - accidentally included two changes.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/CMakeLists.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/CMakeLists.txt?rev=1386783&r1=1386782&r2=1386783&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/CMakeLists.txt (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/CMakeLists.txt Mon Sep 17 19:28:14 2012
@@ -109,7 +109,6 @@ add_executable(test_bulk_crc32
)
set_property(SOURCE main.cpp PROPERTY INCLUDE_DIRECTORIES "\"-Werror\" \"-Wall\"")
-SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
add_dual_library(hadoop
${D}/io/compress/lz4/Lz4Compressor.c
${D}/io/compress/lz4/Lz4Decompressor.c
@@ -126,17 +125,6 @@ add_dual_library(hadoop
${D}/util/NativeCrc32.c
${D}/util/bulk_crc32.c
)
-
-IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- #
- # By embedding '$ORIGIN' into the RPATH of libhadoop.so,
- # dlopen will look in the directory containing libhadoop.so.
- # However, $ORIGIN is not supported by all operating systems.
- #
- SET_TARGET_PROPERTIES(hadoop
- PROPERTIES INSTALL_RPATH "\$ORIGIN/")
-ENDIF()
-
target_link_dual_libraries(hadoop
dl
${JAVA_JVM_LIBRARY}
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java?rev=1386783&r1=1386782&r2=1386783&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java Mon Sep 17 19:28:14 2012
@@ -17,6 +17,9 @@
*/
package org.apache.hadoop.util;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
@@ -101,7 +104,10 @@ public final class ExitUtil {
* @throws ExitException if System.exit is disabled for test purposes
*/
public static void terminate(int status, Throwable t) throws ExitException {
- terminate(status, StringUtils.stringifyException(t));
+ StringWriter sw = new StringWriter();
+ t.printStackTrace(new PrintWriter(sw));
+ terminate(status, "Fatal exception with message " + t.getMessage() +
+ "\nstack trace\n" + sw.toString());
}
/**