From 4806e3e071e42e64eb46e9ba6eb1dcc73a74ff29 Mon Sep 17 00:00:00 2001
From: servertude <servertude@40cadd2d-89a2-4482-8f20-0232d845d7e3>
Date: Sun, 18 May 2008 01:59:12 +0000
Subject: [PATCH] fix for obnoxious error dialog on connect failure due to
 mysql putting stack trace inside getMessage

---
 extra/jheidi/testConnect.ajl | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/extra/jheidi/testConnect.ajl b/extra/jheidi/testConnect.ajl
index f76b5b9a..9943f03a 100644
--- a/extra/jheidi/testConnect.ajl
+++ b/extra/jheidi/testConnect.ajl
@@ -23,8 +23,22 @@ try
   db = new DB((DataSource)ds);
   db.execute("select 'abcdefg'");
 
-} catch (Exception e) {
-  f.popupMessage("Connection Failed!", e.getCause().toString());
+catch (Exception e)
+{
+  Throwable cause = e.getCause();
+  String message = cause.getMessage();
+
+  if (message.indexOf("\n") != -1)
+  {
+    int startMessage = message.indexOf("MESSAGE:");
+    if ( startMessage != -1)
+    {
+      startMessage+=8;
+      message = message.substring(startMessage, message.indexOf("\n", startMessage));
+    }
+  }
+
+  f.popupMessage("Connection Failed!", message);
   db = null;
 }