jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1840833 - in /jmeter/trunk/src: components/org/apache/jmeter/visualizers/backend/influxdb/ core/org/apache/jmeter/engine/ core/org/apache/jmeter/reporters/ jorphan/org/apache/jorphan/reflect/ protocol/http/org/apache/jmeter/protocol/http/c...
Date Thu, 13 Sep 2018 15:09:08 GMT
Author: sebb
Date: Thu Sep 13 15:09:08 2018
New Revision: 1840833

URL: http://svn.apache.org/viewvc?rev=1840833&view=rev
Log:
Replace spurious nbsp with space

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/influxdb/UdpMetricsSender.java
    jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
    jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java
    jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
    jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
    jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/influxdb/UdpMetricsSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/influxdb/UdpMetricsSender.java?rev=1840833&r1=1840832&r2=1840833&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/influxdb/UdpMetricsSender.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/influxdb/UdpMetricsSender.java
Thu Sep 13 15:09:08 2018
@@ -64,10 +64,10 @@ class UdpMetricsSender extends AbstractI
                 hostAddress = InetAddress.getByName(urlComponents[0]);
                 udpPort = Integer.parseInt(urlComponents[1]);
             } else {
-                throw new IllegalArgumentException("Influxdb url '"+influxdbUrl+"' is
wrong. The format shoule be <host/ip>:<port>");
+                throw new IllegalArgumentException("Influxdb url '"+influxdbUrl+"' is wrong.
The format shoule be <host/ip>:<port>");
             }
         } catch (Exception e) {
-            throw new IllegalArgumentException("Influxdb url '"+influxdbUrl+"' is wrong.
The format shoule be <host/ip>:<port>", e);
+            throw new IllegalArgumentException("Influxdb url '"+influxdbUrl+"' is wrong.
The format shoule be <host/ip>:<port>", e);
         }
     }
 

Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=1840833&r1=1840832&r2=1840833&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java Thu Sep 13 15:09:08
2018
@@ -413,7 +413,7 @@ public class StandardJMeterEngine implem
                 AbstractThreadGroup group = setupIter.next();
                 groupCount++;
                 String groupName = group.getName();
-                log.info("Starting setUp ThreadGroup: {} : {} ", groupCount, groupName);
+                log.info("Starting setUp ThreadGroup: {} : {} ", groupCount, groupName);
                 startThreadGroup(group, groupCount, setupSearcher, testLevelElements, notifier);
                 if (serialized && setupIter.hasNext()) {
                     log.info("Waiting for setup thread group: {} to finish before starting
next setup group", 

Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java?rev=1840833&r1=1840832&r2=1840833&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java Thu Sep 13 15:09:08
2018
@@ -236,7 +236,7 @@ public class ResultSaver extends Abstrac
                 throw new JMeterStopTestNowException("Cannot create path hierarchy for folder
"+ parentFile.getAbsolutePath());
             }
         } else {
-            log.debug("Folder {} already exists", parentFile.getAbsolutePath());
+            log.debug("Folder {} already exists", parentFile.getAbsolutePath());
         }
     }
 

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java?rev=1840833&r1=1840832&r2=1840833&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java Thu Sep 13 15:09:08
2018
@@ -378,7 +378,7 @@ public final class ClassFinder {
             }
             boolean found = false;
             for (String currentStrPathOrJar : strPathsOrJars) {
-                log.debug("Testing if {} ends with {}", classpathElement, currentStrPathOrJar);
+                log.debug("Testing if {} ends with {}", classpathElement, currentStrPathOrJar);
                 if (currentStrPathOrJar != null && classpathElement.endsWith(currentStrPathOrJar))
{
                     found = true;
                     log.debug("Adding {}", classpathElement);

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java?rev=1840833&r1=1840832&r2=1840833&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
Thu Sep 13 15:09:08 2018
@@ -251,7 +251,7 @@ public class AuthManager extends ConfigT
             s2 = url2.toString();
         }
 
-        log.debug("Target URL strings to match against: {} and {}", s1, s2);
+        log.debug("Target URL strings to match against: {} and {}", s1, s2);
         // TODO should really return most specific (i.e. longest) match.
         for (JMeterProperty jMeterProperty : getAuthObjects()) {
             Authorization auth = (Authorization) jMeterProperty.getObjectValue();

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java?rev=1840833&r1=1840832&r2=1840833&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java Thu Sep
13 15:09:08 2018
@@ -245,23 +245,23 @@ public class Proxy extends Thread {
         } catch (JMeterException jme) {
             // ignored, already processed
         } catch (UnknownHostException uhe) {
-            log.warn("{} Server Not Found.", port, uhe);
+            log.warn("{} Server Not Found.", port, uhe);
             writeErrorToClient(HttpReplyHdr.formServerNotFound());
             result = generateErrorResult(result, request, uhe); // Generate result (if nec.)
and populate it
         } catch (IllegalArgumentException e) {
-            log.error("{} Not implemented (probably used https)", port, e);
+            log.error("{} Not implemented (probably used https)", port, e);
             writeErrorToClient(HttpReplyHdr.formNotImplemented("Probably used https instead
of http. "
                     + "To record https requests, see "
                     + "<a href=\"http://jmeter.apache.org/usermanual/component_reference.html#HTTP(S)_Test_Script_Recorder\">"
                     + "HTTP(S) Test Script Recorder documentation</a>"));
             result = generateErrorResult(result, request, e); // Generate result (if nec.)
and populate it
         } catch (Exception e) {
-            log.error("{} Exception when processing sample", port, e);
+            log.error("{} Exception when processing sample", port, e);
             writeErrorToClient(HttpReplyHdr.formInternalError());
             result = generateErrorResult(result, request, e); // Generate result (if nec.)
and populate it
         } finally {
             if(sampler != null && isDebug) {
-                log.debug("{} Will deliver sample {}", port, sampler.getName());
+                log.debug("{} Will deliver sample {}", port, sampler.getName());
             }
             /*
              * We don't want to store any cookies in the generated test plan
@@ -293,7 +293,7 @@ public class Proxy extends Thread {
             try {
                 clientSocket.close();
             } catch (Exception e) {
-                log.error("{} Failed to close client socket", port, e);
+                log.error("{} Failed to close client socket", port, e);
             }
             if(sampler != null) {
                 sampler.threadFinished(); // Needed for HTTPSampler2
@@ -310,7 +310,7 @@ public class Proxy extends Thread {
      */
     private SSLSocketFactory getSSLSocketFactory(String host) {
         if (keyStore == null) {
-            log.error("{} No keystore available, cannot record SSL", port);
+            log.error("{} No keystore available, cannot record SSL", port);
             return null;
         }
         final String hashAlias;
@@ -332,7 +332,7 @@ public class Proxy extends Thread {
                     keyAlias = alias;
                 }
             } catch (IOException | GeneralSecurityException e) {
-                log.error("{} Problem with keystore", port, e);
+                log.error("{} Problem with keystore", port, e);
                 return null;
             }
             break;
@@ -348,7 +348,7 @@ public class Proxy extends Thread {
         synchronized (HOST2SSL_SOCK_FAC) {
             final SSLSocketFactory sslSocketFactory = HOST2SSL_SOCK_FAC.get(hashAlias);
             if (sslSocketFactory != null) {
-                log.debug("{} Good, already in map, host={} using alias {}", port, host,
hashAlias);
+                log.debug("{} Good, already in map, host={} using alias {}", port, host,
hashAlias);
                 return sslSocketFactory;
             }
             try {
@@ -356,12 +356,12 @@ public class Proxy extends Thread {
                 sslcontext.init(getWrappedKeyManagers(keyAlias), null, null);
                 SSLSocketFactory sslFactory = sslcontext.getSocketFactory();
                 HOST2SSL_SOCK_FAC.put(hashAlias, sslFactory);
-                log.info("{} KeyStore for SSL loaded OK and put host '{}' in map with
key ({})", port, host, hashAlias);
+                log.info("{} KeyStore for SSL loaded OK and put host '{}' in map with key
({})", port, host, hashAlias);
                 return sslFactory;
             } catch (GeneralSecurityException e) {
-                log.error("{} Problem with SSL certificate", port, e);
+                log.error("{} Problem with SSL certificate", port, e);
             } catch (IOException e) {
-                log.error("{} Problem with keystore", port, e);
+                log.error("{} Problem with keystore", port, e);
             }
             return null;
         }
@@ -436,11 +436,11 @@ public class Proxy extends Thread {
                         sock.getInetAddress().getHostName(), sock.getPort(), true);
                 secureSocket.setUseClientMode(false);
                 if (log.isDebugEnabled()){
-                    log.debug("{} SSL transaction ok with cipher: {}", port, secureSocket.getSession().getCipherSuite());
+                    log.debug("{} SSL transaction ok with cipher: {}", port, secureSocket.getSession().getCipherSuite());
                 }
                 return secureSocket;
             } catch (IOException e) {
-                log.error("{} Error in SSL socket negotiation: ", port, e);
+                log.error("{} Error in SSL socket negotiation: ", port, e);
                 throw e;
             }
         } else {
@@ -484,7 +484,7 @@ public class Proxy extends Thread {
             out.write(CRLF_BYTES);
             out.write(res.getResponseData());
             out.flush();
-            log.debug("{} Done writing to client", port);
+            log.debug("{} Done writing to client", port);
         } catch (IOException e) {
             log.error("", e);
             throw e;
@@ -492,7 +492,7 @@ public class Proxy extends Thread {
             try {
                 out.close();
             } catch (Exception ex) {
-                log.warn("{} Error while closing socket", port, ex);
+                log.warn("{} Error while closing socket", port, ex);
             }
         }
     }
@@ -563,7 +563,7 @@ public class Proxy extends Thread {
             out.writeBytes(message);
             out.flush();
         } catch (Exception e) {
-            log.warn("{} Exception while writing error", port, e);
+            log.warn("{} Exception while writing error", port, e);
         }
     }
 
@@ -603,7 +603,7 @@ public class Proxy extends Thread {
             finder.addFormActionsAndCharSet(result.getResponseDataAsString(), formEncodings,
pageEncoding);
         }
         catch (HTMLParseException parseException) {
-            log.debug("{} Unable to parse response, could not find any form character
set encodings", port);
+            log.debug("{} Unable to parse response, could not find any form character set
encodings", port);
         }
     }
 

Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java?rev=1840833&r1=1840832&r2=1840833&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java Thu
Sep 13 15:09:08 2018
@@ -341,9 +341,9 @@ public class JMSSampler extends Abstract
                 res.setResponseMessage("No message received");
             }
         } catch (Exception ex) {
-            res.setResponseMessage("Error browsing queue '"+queueName+"' with selector
'"
+            res.setResponseMessage("Error browsing queue '"+queueName+"' with selector '"
                     + jmsSelector+ "', timeout '"+getTimeout()+"', message:"+ex.getMessage());
-            LOGGER.error("Error browsing queue {} with selector {} and configured timeout
{}", queueName, jmsSelector,
+            LOGGER.error("Error browsing queue {} with selector {} and configured timeout
{}", queueName, jmsSelector,
                     getTimeout(), ex);
         } finally {
             Utils.close(consumer, LOGGER);

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=1840833&r1=1840832&r2=1840833&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 Thu
Sep 13 15:09:08 2018
@@ -119,7 +119,7 @@ public class TCPSampler extends Abstract
                 log.debug("Successfully loaded properties"); //$NON-NLS-1$
                 hsp = true;
             } catch (FileNotFoundException e) {
-                log.debug("Property file {} not found", STATUS_PROPERTIES); //$NON-NLS-1$
+                log.debug("Property file {} not found", STATUS_PROPERTIES); //$NON-NLS-1$
             } catch (IOException e) {
                 log.debug("Error reading property file {} error {}", STATUS_PROPERTIES, e.toString());
//$NON-NLS-1$
             }
@@ -341,7 +341,7 @@ public class TCPSampler extends Abstract
             }
 
             if (log.isDebugEnabled()) {
-                log.debug("{} Created: {}@{}", this, getClassname(), Integer.toHexString(tcpClient.hashCode()));
//$NON-NLS-1$
+                log.debug("{} Created: {}@{}", this, getClassname(), Integer.toHexString(tcpClient.hashCode()));
//$NON-NLS-1$
             }
         } catch (Exception e) {
             log.error("{} Exception creating: {} ", this, getClassname(), e); //$NON-NLS-1$



Mime
View raw message