aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorJenkins CI <ci@sonarsource.com>2015-03-20 18:01:15 +0100
committerJenkins CI <ci@sonarsource.com>2015-03-20 18:01:15 +0100
commit99c983079b5cd16c34f6407fcfac9cb5b7e821d9 (patch)
tree77254288b9a7728d148e20daef0d62154bf8920b /server
parentb68ea730e96bed09e7a9dd4a102fa8cc94d8f416 (diff)
parent714e8573ef4e957a31060015c8af00fd001ea17a (diff)
downloadsonarqube-99c983079b5cd16c34f6407fcfac9cb5b7e821d9.tar.gz
sonarqube-99c983079b5cd16c34f6407fcfac9cb5b7e821d9.zip
Automatic merge from branch-5.1
* origin/branch-5.1: Fix quality flaw
Diffstat (limited to 'server')
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/db/ResultSetIterator.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/ResultSetIterator.java b/server/sonar-server/src/main/java/org/sonar/server/db/ResultSetIterator.java
index 77392ec0957..ec5fa2a5299 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/db/ResultSetIterator.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/db/ResultSetIterator.java
@@ -21,8 +21,6 @@ package org.sonar.server.db;
import org.apache.commons.dbutils.DbUtils;
-import javax.annotation.CheckForNull;
-
import java.io.Closeable;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -76,7 +74,6 @@ public abstract class ResultSetIterator<E> implements Iterator<E>, Closeable {
}
@Override
- @CheckForNull
public E next() {
if (!hasNext()) {
close();