svn commit: r1724970 - in /jmeter/trunk: src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java xdocs/usermanual/listeners.xml

[pm...@apache.org]

Author: pmouawad
Date: Sat Jan 16 13:04:30 2016
New Revision: 1724970

URL: http://svn.apache.org/viewvc?rev=1724970&view=rev
Log:

Update java6 references to Java7

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
    jmeter/trunk/xdocs/usermanual/listeners.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java?rev=1724970&r1=1724969&r2=1724970&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java Sat Jan 16 13:04:30 2016
@@ -178,7 +178,7 @@ public final class JmeterKeyStore {
         if(result != null) {
             return result;
         }
-        // API expects null not empty array, see http://docs.oracle.com/javase/6/docs/api/javax/net/ssl/X509KeyManager.html
+        // API expects null not empty array, see http://docs.oracle.com/javase/7/docs/api/javax/net/ssl/X509KeyManager.html
         throw new IllegalArgumentException("No certificate found for alias:'"+alias+"'");
     }
 

Modified: jmeter/trunk/xdocs/usermanual/listeners.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/listeners.xml?rev=1724970&r1=1724969&r2=1724970&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/listeners.xml (original)
+++ jmeter/trunk/xdocs/usermanual/listeners.xml Sat Jan 16 13:04:30 2016
@@ -195,7 +195,7 @@ sampleresult.timestamp.start=true
 </source>
 <p>
 The date format to be used for the <code>timestamp_format</code> is described in <a
-HREF="http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html">
+HREF="http://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html">
 <b>SimpleDateFormat</b></a>.
 The timestamp format is used for both writing and reading files.
 If the format is set to "<code>ms</code>", and the column does not parse as a long integer,