From 97ea65bdcfd4ab33f7823b4423b78f1cdbd96394 Mon Sep 17 00:00:00 2001
From: Alex Shvid <a@shvid.com>
Date: Mon, 25 Nov 2013 18:12:26 -0800
Subject: [PATCH] CassandraExceptionTranslator wrong order fix

---
 .../cassandra/support/CassandraExceptionTranslator.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springframework/cassandra/support/CassandraExceptionTranslator.java b/src/main/java/org/springframework/cassandra/support/CassandraExceptionTranslator.java
index 1733e2b76..b2fe93910 100644
--- a/src/main/java/org/springframework/cassandra/support/CassandraExceptionTranslator.java
+++ b/src/main/java/org/springframework/cassandra/support/CassandraExceptionTranslator.java
@@ -70,14 +70,14 @@ public class CassandraExceptionTranslator implements PersistenceExceptionTransla
 	 */
 	public DataAccessException translateExceptionIfPossible(RuntimeException x) {
 
-		if (!(x instanceof DriverException)) {
-			return null;
-		}
-
 		if (x instanceof DataAccessException) {
 			return (DataAccessException) x;
 		}
 
+		if (!(x instanceof DriverException)) {
+			return null;
+		}
+
 		// Remember: subclasses must come before superclasses, otherwise the
 		// superclass would match before the subclass!