Merge branch 'S4-96' into dev

apache · Sep 12, 2012 · a7f86ac · a7f86ac
2 parents 53e0d34 + ad1b1bf
commit a7f86ac
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 54 deletions.
diff --git a/subprojects/s4-core/src/main/java/org/apache/s4/core/Key.java b/subprojects/s4-core/src/main/java/org/apache/s4/core/Key.java
diff --git a/subprojects/s4-core/src/main/java/org/apache/s4/core/Main.java b/subprojects/s4-core/src/main/java/org/apache/s4/core/Main.java
@@ -21,6 +21,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -77,6 +78,14 @@ public static void main(String[] args) {
 
     private static void startNode(MainArgs mainArgs) {
         try {
+            Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandler() {
+
+                @Override
+                public void uncaughtException(Thread t, Throwable e) {
+                    logger.error("Uncaught exception in thread {}", t.getName(), e);
+
+                }
+            });
             Injector injector;
             InputStream commConfigFileInputStream;
             InputStream coreConfigFileInputStream;

diff --git a/subprojects/s4-core/src/main/java/org/apache/s4/core/RemoteStream.java b/subprojects/s4-core/src/main/java/org/apache/s4/core/RemoteStream.java
@@ -22,6 +22,7 @@
 
 import org.apache.s4.base.Event;
 import org.apache.s4.base.Hasher;
+import org.apache.s4.base.Key;
 import org.apache.s4.base.KeyFinder;
 import org.apache.s4.comm.topology.RemoteStreams;
 import org.slf4j.Logger;

diff --git a/subprojects/s4-core/src/main/java/org/apache/s4/core/Stream.java b/subprojects/s4-core/src/main/java/org/apache/s4/core/Stream.java
@@ -25,6 +25,7 @@
 import org.apache.s4.base.Event;
 import org.apache.s4.base.EventMessage;
 import org.apache.s4.base.GenericKeyFinder;
+import org.apache.s4.base.Key;
 import org.apache.s4.base.KeyFinder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;