Author: fschumacher
Date: Sun Apr 16 09:18:32 2017
New Revision: 1791581
URL: http://svn.apache.org/viewvc?rev=1791581&view=rev
Log:
Fix some typo in comments or log messages.
Part of #290 on github, contributed by Anass Benomar (abenomar at umanis.com).
Bugzilla Id: 60994
Modified:
jmeter/trunk/bin/saveservice.properties
jmeter/trunk/build.xml
jmeter/trunk/docs/changes_history.html
jmeter/trunk/src/components/org/apache/jmeter/control/ForeachController.java
jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTreePanel.java
jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
jmeter/trunk/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java
jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleWriter.java
jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleException.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java
jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java
jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java
jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java
jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java
jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/ReadException.java
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java
jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/changes_history.xml
Modified: jmeter/trunk/bin/saveservice.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/saveservice.properties?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/bin/saveservice.properties (original)
+++ jmeter/trunk/bin/saveservice.properties Sun Apr 16 09:18:32 2017
@@ -47,7 +47,7 @@
# Conversion version (for JMX output files)
# Must be updated if the file has been changed since the previous release
# Format is:
-# Save service version=JMeter version at which change occured
+# Save service version=JMeter version at which change occurred
# 1.7 = 2.1.1
# 1.8 = 2.1.2
# (Some version updates were missed here...)
Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Apr 16 09:18:32 2017
@@ -83,7 +83,7 @@
-->
- <!-- Minimal version of Apache Ant requiere by this Ant script -->
+ <!-- Minimal version of Apache Ant required by this Ant script -->
<property name="ant.version.required" value="1.8.2" />
<!-- Are we running under Gump? -->
@@ -901,7 +901,7 @@
description="Compile everything and create the jars"/>
<target name="package-and-check" depends="clean, download_jars, package, checkstyle,
rat"
- description="Compile, create jars and apply checkstyle before commiting code"/>
+ description="Compile, create jars and apply checkstyle before committing code"/>
<target name="prepare-resources"
description="Prepare some resources files, update date">
@@ -2257,7 +2257,7 @@ run JMeter unless all the JMeter jars ar
<format property="THISYEAR" pattern="yyyy"/>
</tstamp>
- <!-- JMeter Javadoc version (own variable is used so can be overriden independently)
-->
+ <!-- JMeter Javadoc version (own variable is used so can be overridden independently)
-->
<property name="docversion" value="${jmeter.version}"/>
<mkdir dir="${dest.docs.api}"/>
Modified: jmeter/trunk/docs/changes_history.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/changes_history.html?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/docs/changes_history.html (original)
+++ jmeter/trunk/docs/changes_history.html Sun Apr 16 09:18:32 2017
@@ -4826,7 +4826,7 @@ this version no PreparedStatement will b
<li>JSR223 Test Elements that have an invalid filename (not existing or unreadable)
will make test fail instead of
making the element silently work</li>
<li>In JSR223 Test Elements: responseCodeOk, responseMessageOK and successful are
set before
- script is executed, if responseData is set it will not be overriden anymore by a toString()
on script return value</li>
+ script is executed, if responseData is set it will not be overridden anymore by a toString()
on script return value</li>
</ul>
</p>
Modified: jmeter/trunk/src/components/org/apache/jmeter/control/ForeachController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/ForeachController.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/ForeachController.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/ForeachController.java Sun Apr 16
09:18:32 2017
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
/**
* ForeachController that iterates over a list of variables named XXXX_NN stored in {@link
JMeterVariables}
- * where NN is a number starting from 1 to number of occurences.
+ * where NN is a number starting from 1 to number of occurrences.
* This list of variable is usually set by PostProcessor (Regexp PostProcessor or {@link
org.apache.jmeter.extractor.HtmlExtractor})
* Iteration can take the full list or only a subset (configured through indexes)
*
Modified: jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java Sun Apr 16
09:18:32 2017
@@ -148,7 +148,7 @@ public class ModuleController extends Ge
/**
* In GUI Mode replacement occurs when test start
* In Non GUI Mode replacement occurs before test runs
- * @return true if replacement occured at the time method is called
+ * @return true if replacement occurred at the time method is called
*/
private boolean hasReplacementOccured() {
if(GuiPackage.getInstance() != null) {
Modified: jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java Sun Apr 16
09:18:32 2017
@@ -139,7 +139,7 @@ public class CounterConfig extends Abstr
DecimalFormat myFormatter = new DecimalFormat(format);
return myFormatter.format(value);
} catch (IllegalArgumentException ignored) {
- log.warn("Error formating {} at format {}, using default", value, format);
+ log.warn("Error formatting {} at format {}, using default", value, format);
}
}
return Long.toString(value);
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java Sun Apr 16
09:18:32 2017
@@ -112,7 +112,7 @@ public class RenderAsHTML extends Sample
} catch (NumberFormatException e) {
// Java Bug : http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=9001188.
// See https://bz.apache.org/bugzilla/show_bug.cgi?id=54586
- log.warn("An error occured rendering html code", e);
+ log.warn("An error occurred rendering html code", e);
results.setText("Failed to render HTML: " + e.getMessage() +", use Text renderer");
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTreePanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTreePanel.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTreePanel.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTreePanel.java Sun Apr
16 09:18:32 2017
@@ -164,7 +164,7 @@ public class SearchTreePanel extends JPa
/**
- * return true if a match occured
+ * return true if a match occurred
*/
private boolean doSearch() {
String wordToSearch = searchTF.getText();
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java Sun Apr 16 09:18:32
2017
@@ -226,7 +226,7 @@ public class GenericController extends A
/**
* Increment the current pointer and return the element. Called by
- * {@link #next()} if the element is a sampler. (May be overriden by
+ * {@link #next()} if the element is a sampler. (May be overridden by
* sub-classes).
*
* @param element
Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java Sun Apr 16 09:18:32
2017
@@ -159,7 +159,7 @@ public class ClientJMeterEngine implemen
/**
* Tidy up RMI access to allow JMeter client to exit.
- * Currently just interrups the "RMI Reaper" thread.
+ * Currently just interrupts the "RMI Reaper" thread.
* @param logger where to log the information
*/
public static void tidyRMI(Logger logger) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java Sun Apr 16 09:18:32
2017
@@ -84,7 +84,7 @@ public interface JMeterGUIComponent exte
* the component's label in the local language. The resource name is fixed,
* and does not vary with the selected language.
*
- * Normally this method should be overriden in preference to overriding
+ * Normally this method should be overridden in preference to overriding
* getStaticLabel(). However where the resource name is not available or required,
* getStaticLabel() may be overridden instead.
*
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java Sun Apr 16 09:18:32
2017
@@ -246,7 +246,7 @@ public class SearchTreeDialog extends JD
nodes.addAll(matchingNodes);
}
} catch (Exception ex) {
- logger.error("Error occured searching for word:"+ wordToSearch+ " in node:"+jMeterTreeNode.getName(),
ex);
+ logger.error("Error occurred searching for word:"+ wordToSearch+ " in node:"+jMeterTreeNode.getName(),
ex);
}
}
GuiPackage guiInstance = GuiPackage.getInstance();
@@ -266,7 +266,7 @@ public class SearchTreeDialog extends JD
}
/**
- * Replace all occurences in nodes that contain {@link Replaceable} Test Elements
+ * Replace all occurrences in nodes that contain {@link Replaceable} Test Elements
* @param e {@link ActionEvent}
*/
private void doReplaceAll(ActionEvent e) {
@@ -313,10 +313,10 @@ public class SearchTreeDialog extends JD
}
}
} catch (Exception ex) {
- logger.error("Error occured replacing data in node:"+jMeterTreeNode.getName(),
ex);
+ logger.error("Error occurred replacing data in node:"+jMeterTreeNode.getName(),
ex);
}
}
- statusLabel.setText(MessageFormat.format("Replaced {0} occurences", new Object[]{totalReplaced}));
+ statusLabel.setText(MessageFormat.format("Replaced {0} occurrences", new Object[]{totalReplaced}));
GuiPackage guiInstance = GuiPackage.getInstance();
JTree jTree = guiInstance.getMainFrame().getTree();
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java Sun Apr
16 09:18:32 2017
@@ -153,7 +153,7 @@ public class TemplateManager {
}
} catch(Exception ex) {
if (log.isWarnEnabled()) {
- log.warn("Ignoring template file:'{}', an error occured parsing the
file", f.getAbsolutePath(),
+ log.warn("Ignoring template file:'{}', an error occurred parsing
the file", f.getAbsolutePath(),
ex);
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
Sun Apr 16 09:18:32 2017
@@ -638,7 +638,7 @@ public class ReportGeneratorConfiguratio
long.class).longValue();
configuration.setApdexToleratedThreshold(apdexToleratedThreshold);
- // Load apdex per transactions, overriden by user
+ // Load apdex per transactions, overridden by user
final String apdexPerTransaction = getOptionalProperty(props,
REPORT_GENERATOR_KEY_APDEX_PER_TRANSACTION,
String.class);
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleWriter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleWriter.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleWriter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleWriter.java Sun Apr 16 09:18:32
2017
@@ -37,7 +37,7 @@ import org.apache.jmeter.save.CSVSaveSer
*/
public class CsvSampleWriter extends AbstractSampleWriter {
- /** The number of columnns for each row */
+ /** The number of columns for each row */
private int columnCount;
/** The separator to be used in between data on each row */
@@ -129,7 +129,7 @@ public class CsvSampleWriter extends Abs
}
/**
- * Write the csv header. If samples have alredy been written then a row with
+ * Write the csv header. If samples have already been written then a row with
* header information will be written in the middle of the file.
*/
public void writeHeader() {
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleException.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleException.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleException.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleException.java Sun Apr 16 09:18:32
2017
@@ -18,7 +18,7 @@
package org.apache.jmeter.report.core;
/**
- * Thrown when some sample processing occured
+ * Thrown when some sample processing occurred
*
* @since 3.0
*/
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Sun Apr 16 09:18:32
2017
@@ -223,7 +223,7 @@ critical_section_controller_label=Lock n
critical_section_controller_title=Critical Section Controller
cssjquery_attribute=Attribute\:
cssjquery_empty_default_value=Use empty default value
-cssjquery_tester_error=An error occured evaluating expression:{0}, error:{1}
+cssjquery_tester_error=An error occurred evaluating expression:{0}, error:{1}
cssjquery_impl=CSS/JQuery implementation\:
cssjquery_render_no_text=Data response result isn't text.
cssjquery_tester_button_test=Test
@@ -557,7 +557,7 @@ junit_create_instance_per_sample=Create
junit_do_setup_teardown=Do not call setUp and tearDown
junit_error_code=Error Code
junit_error_default_code=9999
-junit_error_default_msg=An unexpected error occured
+junit_error_default_msg=An unexpected error occurred
junit_error_msg=Error Message
junit_failure_code=Failure Code
junit_failure_default_code=0001
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java Sun Apr 16
09:18:32 2017
@@ -101,7 +101,7 @@ public class RemoteListenerWrapper exten
// is not used, but it may become an issue in the future. Then these
// events must also be stored so that replay of all events may occur and
// in the right order. Each stored event must then be tagged with something
- // that lets you distinguish between occured, started and ended.
+ // that lets you distinguish between occurred, started and ended.
@Override
public void sampleStarted(SampleEvent e) {
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=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Sun Apr 16 09:18:32 2017
@@ -355,7 +355,7 @@ public class SaveService {
try {
return "class:"+result.getClass()+",content:"+ToStringBuilder.reflectionToString(result);
} catch(Exception e) {
- return "Exception occured creating debug from event, message:"+e.getMessage();
+ return "Exception occurred creating debug from event, message:"+e.getMessage();
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java Sun Apr 16 09:18:32 2017
@@ -454,7 +454,7 @@ public class ThreadGroup extends Abstrac
try {
threadStarter.interrupt();
} catch (Exception e) {
- log.warn("Exception occured interrupting ThreadStarter", e);
+ log.warn("Exception occurred interrupting ThreadStarter", e);
}
}
@@ -477,7 +477,7 @@ public class ThreadGroup extends Abstrac
try {
threadStarter.interrupt();
} catch (Exception e) {
- log.warn("Exception occured interrupting ThreadStarter", e);
+ log.warn("Exception occurred interrupting ThreadStarter", e);
}
}
for (JMeterThread item : allThreads.keySet()) {
@@ -677,7 +677,7 @@ public class ThreadGroup extends Abstrac
newThread.start();
}
} catch (Exception ex) {
- log.error("An error occured scheduling delay start of threads for Thread
Group: {}", getName(), ex);
+ log.error("An error occurred scheduling delay start of threads for Thread
Group: {}", getName(), ex);
}
}
}
Modified: jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java Sun Apr 16 09:18:32
2017
@@ -177,7 +177,7 @@ public final class CLArgsParser {
}
/**
- * Retrieve an error message that occured during parsing if one existed.
+ * Retrieve an error message that occurred during parsing if one existed.
*
* @return the error string
*/
@@ -604,7 +604,7 @@ public final class CLArgsParser {
final String argument = sb.toString();
- // System.out.println( "Arguement:" + argument );
+ // System.out.println( "Argument:" + argument );
this.option.addArgument(argument);
addOption(this.option);
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java Sun Apr 16 09:18:32
2017
@@ -126,7 +126,7 @@ public class JLabeledTextArea extends JP
* Callback method when the focus to the Text Field component is lost.
*
* @param pFocusEvent
- * The focus event that occured.
+ * The focus event that occurred.
*/
@Override
public void focusLost(FocusEvent pFocusEvent) {
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java Sun Apr 16 09:18:32
2017
@@ -128,7 +128,7 @@ public class JLabeledTextField extends J
* Callback method when the focus to the Text Field component is lost.
*
* @param pFocusEvent
- * The focus event that occured.
+ * The focus event that occurred.
*/
@Override
public void focusLost(FocusEvent pFocusEvent) {
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java Sun Apr 16 09:18:32
2017
@@ -625,7 +625,7 @@ public final class JOrphanUtils {
* @param regex Regular expression
* @param replacement Replacement text to which function applies a quoting
* @param caseSensitive is case taken into account
- * @return array of Object where first row is the replaced text, second row is the number
of replacement that occured
+ * @return array of Object where first row is the replaced text, second row is the number
of replacement that occurred
*/
public static Object[] replaceAllWithRegex(
String source, String regex, String replacement, boolean caseSensitive) {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java
Sun Apr 16 09:18:32 2017
@@ -89,7 +89,7 @@ public class URLCollection implements It
} catch (MalformedURLException mfue) {
// No WARN message to avoid performance impact
if(log.isDebugEnabled()) {
- log.debug("Error occured building relative url for:"+url+", message:"+mfue.getMessage());
+ log.debug("Error occurred building relative url for:"+url+", message:"+mfue.getMessage());
}
// No point in adding the URL as String as it will result in null
// returned during iteration, see URLString
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java
Sun Apr 16 09:18:32 2017
@@ -65,7 +65,7 @@ public class MeasuringConnectionManager
}
/**
- * Overriden to use {@link JMeterClientConnectionOperator} and fix SNI issue
+ * Overridden to use {@link JMeterClientConnectionOperator} and fix SNI issue
* @see "https://bz.apache.org/bugzilla/show_bug.cgi?id=57935"
* @see org.apache.http.impl.conn.PoolingClientConnectionManager#createConnectionOperator(org.apache.http.conn.scheme.SchemeRegistry)
*/
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java
Sun Apr 16 09:18:32 2017
@@ -57,7 +57,7 @@ public class SharedTCLogParser extends T
} catch (Exception exception) {
log.error("Problem creating samples", exception);
}
- return -1;// indicate that an error occured
+ return -1;// indicate that an error occurred
}
/**
Modified: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
(original)
+++ jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
Sun Apr 16 09:18:32 2017
@@ -271,7 +271,7 @@ public class DataSourceElement extends A
/**
* @return Connection
- * @throws SQLException if database access error occurrs
+ * @throws SQLException if database access error occurred
*/
public Connection getConnection() throws SQLException {
Connection conn;
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java Sun
Apr 16 09:18:32 2017
@@ -52,7 +52,7 @@ public class ClientPool {
/**
* Clear all the clients created by either Publish or Subscribe sampler. We
- * need to do this to make sure all the threads creatd during the test are
+ * need to do this to make sure all the threads created during the test are
* destroyed and cleaned up. In some cases, the client provided by the
* manufacturer of the JMS server may have bugs and some threads may become
* zombie. In those cases, it is not the responsibility of JMeter for those
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
(original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
Sun Apr 16 09:18:32 2017
@@ -229,7 +229,7 @@ public class SubscriberSampler extends B
}
/**
- * Try to reconnect if configured to or temporize if not or an exception occured
+ * Try to reconnect if configured to or temporize if not or an exception occurred
* @param reconnect
*/
private void handleErrorAndAddTemporize(boolean reconnect) {
Modified: jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/ReadException.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/ReadException.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/ReadException.java
(original)
+++ jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/ReadException.java
Sun Apr 16 09:18:32 2017
@@ -18,7 +18,7 @@
package org.apache.jmeter.protocol.tcp.sampler;
/**
- * Exception that contains partial response (Text read until exception occured)
+ * Exception that contains partial response (Text read until exception occurred)
*/
public class ReadException extends Exception {
@@ -37,7 +37,7 @@ public class ReadException extends Excep
* Constructor
* @param message Message
* @param cause Source cause
- * @param partialResponse Text read until error occured
+ * @param partialResponse Text read until error occurred
*/
public ReadException(String message, Throwable cause, String partialResponse) {
super(message, cause);
@@ -45,7 +45,7 @@ public class ReadException extends Excep
}
/**
- * @return the partialResponse Text read until error occured
+ * @return the partialResponse Text read until error occurred
*/
public String getPartialResponse() {
return partialResponse;
Modified: jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java (original)
+++ jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java Sun
Apr 16 09:18:32 2017
@@ -68,7 +68,7 @@ public interface TCPClient {
* @param is -
* InputStream for socket
* @return String read from socket
- * @throws ReadException exception that can contain partial response (Response until
error occured)
+ * @throws ReadException exception that can contain partial response (Response until
error occurred)
*/
String read(InputStream is) throws ReadException;
Modified: jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java (original)
+++ jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java Sun
Apr 16 09:18:32 2017
@@ -429,7 +429,7 @@ public class TCPSampler extends Abstract
/**
* Fills SampleResult object
* @param sampleResult {@link SampleResult}
- * @param readResponse Response read until error occured
+ * @param readResponse Response read until error occurred
* @param exception Source exception
* @param protocolHandler {@link TCPClient}
* @return boolean if sample is considered as successful
Modified: jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java Sun Apr 16 09:18:32
2017
@@ -71,7 +71,7 @@ public class TestIfController extends JM
}
assertEquals(0, counter);
} catch (StackOverflowError e) {
- fail("Stackoverflow occured in testStackOverflow");
+ fail("Stackoverflow occurred in testStackOverflow");
}
}
@@ -140,7 +140,7 @@ public class TestIfController extends JM
assertEquals("0", vars.get("VAR1"));
} catch (StackOverflowError e) {
- fail("Stackoverflow occured in testStackOverflow");
+ fail("Stackoverflow occurred in testStackOverflow");
}
}
Modified: jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java Sun Apr 16 09:18:32
2017
@@ -285,7 +285,7 @@ public class TestXPathExtractor {
@Test
public void testNonXmlDocument() throws Exception {
- result.setResponseData("Error:exception occured", null);
+ result.setResponseData("Error:exception occurred", null);
extractor.setXPathQuery("//test");
extractor.process();
assertEquals(1, result.getAssertionResults().length);
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Apr 16 09:18:32 2017
@@ -162,7 +162,7 @@ Summary
<h3>General</h3>
<ul>
- <li><bug>60994</bug>Fix some typo in comments or log messages</li>
+ <li><bug>60994</bug>Fix some typo in comments or log messages. <pr>289</pr>
and <pr>290</pr></li>
</ul>
<!-- =================== Thanks =================== -->
@@ -171,7 +171,7 @@ Summary
<p>We thank all contributors mentioned in bug and improvement sections above:
</p>
<ul>
-<li>Mithrandir0407 @ github</li>
+<li>Anass Benomar (abenomar at umanis.com, Mithrandir0407 @ github)</li>
</ul>
<p>We also thank bug reporters who helped us improve JMeter. <br/>
For this release we want to give special thanks to the following reporters for the clear
reports and tests made after our fixes:</p>
Modified: jmeter/trunk/xdocs/changes_history.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes_history.xml?rev=1791581&r1=1791580&r2=1791581&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes_history.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes_history.xml [utf-8] Sun Apr 16 09:18:32 2017
@@ -3404,7 +3404,7 @@ this version no PreparedStatement will b
<li>JSR223 Test Elements that have an invalid filename (not existing or unreadable)
will make test fail instead of
making the element silently work</li>
<li>In JSR223 Test Elements: responseCodeOk, responseMessageOK and successful are
set before
- script is executed, if responseData is set it will not be overriden anymore by a toString()
on script return value</li>
+ script is executed, if responseData is set it will not be overridden anymore by a toString()
on script return value</li>
</ul>
</p>
|