Updated Branches: refs/heads/master 4adb1e749 -> d65797826
CAMEL-6144: Corrected the typos. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d6579782 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d6579782 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d6579782 Branch: refs/heads/master Commit: d65797826ca1a66e9a16e764a05cf1e4047d1a73 Parents: 4adb1e7 Author: Babak Vahdat <bvah...@apache.org> Authored: Wed Jul 24 16:43:31 2013 +0200 Committer: Babak Vahdat <bvah...@apache.org> Committed: Wed Jul 24 16:43:31 2013 +0200 ---------------------------------------------------------------------- .../jdbc/DefaultJdbcOptimisticLockingExceptionMapper.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d6579782/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/DefaultJdbcOptimisticLockingExceptionMapper.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/DefaultJdbcOptimisticLockingExceptionMapper.java b/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/DefaultJdbcOptimisticLockingExceptionMapper.java index ed3c8fb..54e69f7 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/DefaultJdbcOptimisticLockingExceptionMapper.java +++ b/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/DefaultJdbcOptimisticLockingExceptionMapper.java @@ -46,19 +46,20 @@ public class DefaultJdbcOptimisticLockingExceptionMapper implements JdbcOptimist public boolean isOptimisticLocking(Exception cause) { Iterator<Throwable> it = ObjectHelper.createExceptionIterator(cause); while (it.hasNext()) { + Throwable throwable = it.next(); // if its a SQL exception - if (it instanceof SQLException) { + if (throwable instanceof SQLException) { SQLException se = (SQLException) it; if (isConstraintViolation(se)) { return true; } } - if (it instanceof DataIntegrityViolationException) { + if (throwable instanceof DataIntegrityViolationException) { return true; } // fallback to names - String name = it.next().getClass().getName(); + String name = throwable.getClass().getName(); if (name.contains("ConstraintViolation") || hasClassName(name)) { return true; }