Update to Connector/J 5.1.

--HG--
extra : convert_revision : svn%3Aafccd9b4-69c3-4f67-9d0d-5b27f80d3d7c/trunk%4012

diff --git a/.classpath b/.classpath
index 4a42b93ee1fb23961edf44acb1b34f9bb68ca77c..aa05f12c2a12a181f7067f288a17b247d0379172 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -2,9 +2,9 @@
 <classpath>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
-       <classpathentry kind="lib" path="mysql-connector-java-5.0.8-bin.jar">\r
+       <classpathentry kind="lib" path="mysql-connector-java-5.1.8-bin.jar">\r
                <attributes>\r
-                       <attribute name="javadoc_location" value="jar:platform:/resource/RizonHelpBot/mysql-connector-java-5.0.8-doc.jar!/"/>\r
+                       <attribute name="javadoc_location" value="jar:platform:/resource/BncBot/mysql-connector-java-5.1.8-doc.jar!/"/>\r
                </attributes>\r
        </classpathentry>\r
        <classpathentry kind="output" path="bin"/>\r

diff --git a/build.xml b/build.xml
index 51e0fb866dd99dcbbea83e6e152ee8373421929c..f30147b58fa5430845a3b67107fcc621415b7599 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -10,8 +10,7 @@
        \r
        <target name="rebuild" depends="clean,build" />\r
        \r
-       <target name="build">\r
-               <mkdir dir="build" />\r
+       <target name="build" depends="dirs">\r
                <javac srcdir="src" destdir="build" classpathref="cp" debug="off" source="1.6" />\r
                <jar destfile="build/bncbot.jar" compress="true">\r
                        <fileset dir="build">\r
@@ -20,7 +19,7 @@
                </jar>\r
        </target>\r
        \r
-       <target name="clean">\r
+       <target name="clean" depends="dirs">\r
                <delete>\r
                        <fileset dir="build">\r
                                <include name="bncbot.jar" />\r
@@ -28,4 +27,8 @@
                        </fileset>\r
                </delete>\r
        </target>\r
+       \r
+       <target name="dirs">\r
+               <mkdir dir="build" />\r
+       </target>\r
 </project>\r

diff --git a/mysql-connector-java-5.0.8-bin.jar b/mysql-connector-java-5.0.8-bin.jar
deleted file mode 100644 (file)
index 0170c3e..0000000
Binary files a/mysql-connector-java-5.0.8-bin.jar and /dev/null differ

diff --git a/mysql-connector-java-5.0.8-doc.jar b/mysql-connector-java-5.0.8-doc.jar
deleted file mode 100644 (file)
index 5fedbbf..0000000
Binary files a/mysql-connector-java-5.0.8-doc.jar and /dev/null differ

diff --git a/mysql-connector-java-5.1.8-bin.jar b/mysql-connector-java-5.1.8-bin.jar
new file mode 100644 (file)
index 0000000..5a7c6fb
Binary files /dev/null and b/mysql-connector-java-5.1.8-bin.jar differ

diff --git a/mysql-connector-java-5.1.8-doc.jar b/mysql-connector-java-5.1.8-doc.jar
new file mode 100644 (file)
index 0000000..81a4d17
Binary files /dev/null and b/mysql-connector-java-5.1.8-doc.jar differ

diff --git a/src/net/rizon/DatabaseConnection.java b/src/net/rizon/DatabaseConnection.java
index 9bfb9c79a4136791362420f2056ab27bfb7a2447..0d337c646cb76fcfad22bf1ac5fbd4f52865988b 100644 (file)
--- a/src/net/rizon/DatabaseConnection.java
+++ b/src/net/rizon/DatabaseConnection.java
@@ -30,6 +30,15 @@ public class DatabaseConnection {
                catch (SQLException e) {\r
                        e.printStackTrace();\r
                }\r
+               catch (AbstractMethodError e) {\r
+                       DatabaseConnection.connect();\r
+                       \r
+                       if(con == null) {\r
+                               throw new RuntimeException("MySQL server has gone away. Attempted reconnection failed.");\r
+                       }\r
+                       \r
+                       return con;\r
+               }\r
                return con;\r
        }\r
        \r

diff --git a/src/net/rizon/bncbot/handler/SaveDataHandler.java b/src/net/rizon/bncbot/handler/SaveDataHandler.java
index 519ae3bddfcb3e10f2120332d24abfd1ca65f48b..e4c3f4daac43e82ab377d3c9f5354b31efc905f8 100644 (file)
--- a/src/net/rizon/bncbot/handler/SaveDataHandler.java
+++ b/src/net/rizon/bncbot/handler/SaveDataHandler.java
@@ -12,7 +12,7 @@ public class SaveDataHandler extends AbstractSimpleHandler {
        }\r
        \r
        public void handle() {\r
-               BncBot.database.saveData(args[4].startsWith(":.force"));\r
+               BncBot.database.saveData(args[3].startsWith(":.force"));\r
                BncBot.privmsg(args[2], "Data flushed to MySQL.");\r
        }\r
 }\r