Fix possible NPE

Michael Figuiere · Michael Figuiere · commit 707e8c2ea6ed · 2013-09-09T16:45:50.000-07:00
diff --git a/driver-core/src/main/java/com/datastax/driver/core/Connection.java b/driver-core/src/main/java/com/datastax/driver/core/Connection.java
@@ -21,7 +21,6 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 
 import com.google.common.util.concurrent.AbstractFuture;
@@ -34,7 +33,6 @@
 import org.jboss.netty.bootstrap.ClientBootstrap;
 import org.jboss.netty.channel.*;
 import org.jboss.netty.channel.group.ChannelGroup;
-import org.jboss.netty.channel.group.ChannelGroupFuture;
 import org.jboss.netty.channel.group.DefaultChannelGroup;
 import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
 import org.jboss.netty.handler.ssl.SslHandler;
@@ -116,7 +114,9 @@ private Connection(String name, InetAddress address, Factory factory) throws Con
     }
 
     private static String extractMessage(Throwable t) {
-        String msg = t == null || t.getMessage() == null || t.getMessage().isEmpty()
+    	if (t == null)
+    		return "";
+    	String msg = t.getMessage() == null || t.getMessage().isEmpty()
                    ? t.toString()
                    : t.getMessage();
         return " (" + msg + ")";
