Updated Branches: refs/heads/master aecaee2d1 -> ac9dee94a
fix from Pradeep Soundararajan for removing build dependency on mysql-connector-java https://reviews.apache.org/r/6180 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ac9dee94 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ac9dee94 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ac9dee94 Branch: refs/heads/master Commit: ac9dee94ac9c8e36c0299e6b877fd7bb5b5eaf5d Parents: aecaee2 Author: David Nalley <[email protected]> Authored: Mon Aug 20 13:38:19 2012 -0400 Committer: David Nalley <[email protected]> Committed: Mon Aug 20 13:38:19 2012 -0400 ---------------------------------------------------------------------- deps/awsapi-lib/mysql-connector-java-5.1.7-bin.jar | Bin 709922 -> 0 bytes deps/cloud-mysql-connector-java-5.1.7-bin.jar | Bin 709922 -> 0 bytes .../src/com/cloud/cluster/ClusterManagerImpl.java | 3 ++- 3 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ac9dee94/deps/awsapi-lib/mysql-connector-java-5.1.7-bin.jar ---------------------------------------------------------------------- diff --git a/deps/awsapi-lib/mysql-connector-java-5.1.7-bin.jar b/deps/awsapi-lib/mysql-connector-java-5.1.7-bin.jar deleted file mode 100644 index ebfe068..0000000 Binary files a/deps/awsapi-lib/mysql-connector-java-5.1.7-bin.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ac9dee94/deps/cloud-mysql-connector-java-5.1.7-bin.jar ---------------------------------------------------------------------- diff --git a/deps/cloud-mysql-connector-java-5.1.7-bin.jar b/deps/cloud-mysql-connector-java-5.1.7-bin.jar deleted file mode 100644 index ebfe068..0000000 Binary files a/deps/cloud-mysql-connector-java-5.1.7-bin.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ac9dee94/server/src/com/cloud/cluster/ClusterManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/cluster/ClusterManagerImpl.java b/server/src/com/cloud/cluster/ClusterManagerImpl.java index 4f7cf6f..4dbb16c 100755 --- a/server/src/com/cloud/cluster/ClusterManagerImpl.java +++ b/server/src/com/cloud/cluster/ClusterManagerImpl.java @@ -26,6 +26,7 @@ import java.nio.channels.SocketChannel; import java.rmi.RemoteException; import java.sql.Connection; import java.sql.SQLException; +import java.sql.SQLRecoverableException; import java.util.ArrayList; import java.util.Date; import java.util.Enumeration; @@ -801,7 +802,7 @@ public class ClusterManagerImpl implements ClusterManager { private boolean isRootCauseConnectionRelated(Throwable e) { while (e != null) { - if (e instanceof com.mysql.jdbc.CommunicationsException || e instanceof com.mysql.jdbc.exceptions.jdbc4.CommunicationsException) { + if (e instanceof SQLRecoverableException) { return true; }
