You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/02/18 13:52:32 UTC
svn commit: r1783548 -
/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
Author: pmouawad
Date: Sat Feb 18 13:52:32 2017
New Revision: 1783548
URL: http://svn.apache.org/viewvc?rev=1783548&view=rev
Log:
Document Sonar false positive
Fix s cannot be null so remove test
Modified:
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
Modified: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java?rev=1783548&r1=1783547&r2=1783548&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java (original)
+++ jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java Sat Feb 18 13:52:32 2017
@@ -490,9 +490,9 @@ public abstract class AbstractJDBCTestEl
private PreparedStatement getPreparedStatement(Connection conn, boolean callable) throws SQLException {
PreparedStatement pstmt;
if (callable) {
- pstmt = conn.prepareCall(getQuery());
+ pstmt = conn.prepareCall(getQuery()); // NOSONAR closed by caller
} else {
- pstmt = conn.prepareStatement(getQuery());
+ pstmt = conn.prepareStatement(getQuery()); // NOSONAR closed by caller
}
pstmt.setQueryTimeout(getIntegerQueryTimeout());
return pstmt;
@@ -597,7 +597,7 @@ public abstract class AbstractJDBCTestEl
s.close();
}
} catch (SQLException e) {
- log.warn("Error closing Statement {}", (s != null ? s.toString() : "null"), e);
+ log.warn("Error closing Statement {}", s.toString(), e);
}
}