You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2015/02/28 21:49:17 UTC
svn commit: r1663001 - in /jmeter/trunk/src: core/org/apache/jmeter/save/SaveService.java protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java

Author: fschumacher
Date: Sat Feb 28 20:49:17 2015
New Revision: 1663001

URL: http://svn.apache.org/r1663001
Log:
Fix a few javadoc warnings

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
    jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java?rev=1663001&r1=1663000&r2=1663001&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Sat Feb 28 20:49:17 2015
@@ -507,7 +507,7 @@ public class SaveService {
 
     /**
      * Load a Test tree (JMX file)
-     * @param file the JMX file
+     * @param reader the JMX file as an {@link InputStream}
      * @return the loaded tree or null if an error occurs
      * @throws IOException if there is a problem reading the file or processing it
      * @deprecated use {@link SaveService}{@link #loadTree(File)}

Modified: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java?rev=1663001&r1=1663000&r2=1663001&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java (original)
+++ jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java Sat Feb 28 20:49:17 2015
@@ -108,11 +108,11 @@ public class DataSourceElementBeanInfo e
      * Currently supported tags and their values are:
      * <dl>
      * <dt>DEFAULT</dt><dd>-1</dd>
-     * <dt>TRANSACTION_NONE</dt><dd>{@value Connection#TRANSACTION_NONE}</dd>
-     * <dt>TRANSACTION_REAd_COMMITTED</dt><dd>{@value Connection#TRANSACTION_READ_COMMITTED}</dd>
-     * <dt>TRANSACTION_READ_UNCOMMITTED</dt><dd>{@value Connection#TRANSACTION_READ_UNCOMMITTED}</dd>
-     * <dt>TRANSACTION_REPEATABLE_READ</dt><dd>{@value Connection#TRANSACTION_REPEATABLE_READ}</dd>
-     * <dt>TRANSACTION_SERIALIZABLE</dt><dd>{@value Connection#TRANSACTION_SERIALIZABLE}</dd>
+     * <dt>TRANSACTION_NONE</dt><dd>{@value java.sql.Connection#TRANSACTION_NONE}</dd>
+     * <dt>TRANSACTION_REAd_COMMITTED</dt><dd>{@value java.sql.Connection#TRANSACTION_READ_COMMITTED}</dd>
+     * <dt>TRANSACTION_READ_UNCOMMITTED</dt><dd>{@value java.sql.Connection#TRANSACTION_READ_UNCOMMITTED}</dd>
+     * <dt>TRANSACTION_REPEATABLE_READ</dt><dd>{@value java.sql.Connection#TRANSACTION_REPEATABLE_READ}</dd>
+     * <dt>TRANSACTION_SERIALIZABLE</dt><dd>{@value java.sql.Connection#TRANSACTION_SERIALIZABLE}</dd>
      * </dl>
      * @param tag name of the transaction isolation mode
      * @return integer value of the given transaction isolation mode