Repository: camel Updated Branches: refs/heads/master 0db564a61 -> 420176383
CAMEL-9711: Make code compile on java 1.7 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/42017638 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/42017638 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/42017638 Branch: refs/heads/master Commit: 420176383fb27f51ee4e002e70354213ed2e96f0 Parents: 0db564a Author: Claus Ibsen <[email protected]> Authored: Sat Mar 19 08:09:20 2016 +0100 Committer: Claus Ibsen <[email protected]> Committed: Sat Mar 19 08:09:20 2016 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/camel/component/sql/SqlInIterator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/42017638/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlInIterator.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlInIterator.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlInIterator.java index 32136bb..d708ac2 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlInIterator.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlInIterator.java @@ -48,7 +48,9 @@ public class SqlInIterator implements Iterator { it.remove(); } - @Override + // This method should not have @Override as its a new method in Java 1.8 + // and we need to compile for Java 1.7 also. TODO: enable again in Camel 2.18 onwards + // @Override @SuppressWarnings("unchecked") public void forEachRemaining(Consumer action) { it.forEachRemaining(action);
