jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1719514 - in /jmeter/trunk/src: core/org/apache/jmeter/engine/ core/org/apache/jmeter/gui/ core/org/apache/jmeter/threads/ core/org/apache/jmeter/util/ protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/
Date Fri, 11 Dec 2015 19:53:31 GMT
Author: pmouawad
Date: Fri Dec 11 19:53:31 2015
New Revision: 1719514

URL: http://svn.apache.org/viewvc?rev=1719514&view=rev
Log:
#resolve #54

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
    jmeter/trunk/src/core/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java
    jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
    jmeter/trunk/src/core/org/apache/jmeter/threads/ListenerNotifier.java
    jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java
    jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java?rev=1719514&r1=1719513&r2=1719514&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java Fri Dec 11
19:53:31 2015
@@ -26,7 +26,6 @@ import java.rmi.RemoteException;
 import java.rmi.registry.LocateRegistry;
 import java.rmi.registry.Registry;
 import java.rmi.server.ServerNotActiveException;
-import java.util.Iterator;
 import java.util.Properties;
 
 import org.apache.jmeter.services.FileServer;
@@ -216,8 +215,7 @@ public final class RemoteJMeterEngineImp
         if(remotelySetProperties != null) {
             Properties jmeterProperties = JMeterUtils.getJMeterProperties();
             log.info("Cleaning previously set properties "+remotelySetProperties);
-            for (Iterator<?> iterator = remotelySetProperties.keySet().iterator();
iterator.hasNext();) {
-                String key = (String) iterator.next();
+            for (Object key  : remotelySetProperties.keySet()) {
                 jmeterProperties.remove(key);
             }
         }

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java?rev=1719514&r1=1719513&r2=1719514&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java Fri Dec 11 19:53:31
2015
@@ -75,7 +75,6 @@ public class SavePropertyDialog extends
      * @throws java.awt.HeadlessException - when run headless
      */
     public SavePropertyDialog(Frame owner, String title, boolean modal, SampleSaveConfiguration
s)
-    // throws HeadlessException
     {
         super(owner, title, modal);
         saveConfig = s;

Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java?rev=1719514&r1=1719513&r2=1719514&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java
Fri Dec 11 19:53:31 2015
@@ -91,7 +91,7 @@ public class FindTestElementsUpToRootTra
     public List<Controller> getControllersToRoot() {
         List<Controller> result = new ArrayList<>(stack.size());
         LinkedList<TestElement> stackLocalCopy = new LinkedList<>(stack);
-        while(stackLocalCopy.size()>0) {
+        while(!stackLocalCopy.isEmpty()) {
             TestElement te = stackLocalCopy.getLast();
             if(te instanceof Controller) {
                 result.add((Controller)te);

Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java?rev=1719514&r1=1719513&r2=1719514&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java Fri Dec 11 19:53:31
2015
@@ -20,7 +20,6 @@ package org.apache.jmeter.threads;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.concurrent.TimeUnit;
@@ -329,21 +328,18 @@ public class JMeterThread implements Run
      */
     private void triggerEndOfLoopOnParentControllers(Sampler sam, JMeterContext threadContext)
{
         // Find parent controllers of current sampler
-        FindTestElementsUpToRootTraverser pathToRootTraverser=null;
+        FindTestElementsUpToRootTraverser pathToRootTraverser = null;
         TransactionSampler transactionSampler = null;
         if(sam instanceof TransactionSampler) {
             transactionSampler = (TransactionSampler) sam;
-            pathToRootTraverser = new FindTestElementsUpToRootTraverser((transactionSampler).getTransactionController());
+            pathToRootTraverser = new FindTestElementsUpToRootTraverser(transactionSampler.getTransactionController());
         } else {
             pathToRootTraverser = new FindTestElementsUpToRootTraverser(sam);
         }
         testTree.traverse(pathToRootTraverser);
         List<Controller> controllersToReinit = pathToRootTraverser.getControllersToRoot();
-
         // Trigger end of loop condition on all parent controllers of current sampler
-        for (Iterator<Controller> iterator = controllersToReinit
-                .iterator(); iterator.hasNext();) {
-            Controller parentController =  iterator.next();
+        for (Controller parentController : controllersToReinit) {
             if(parentController instanceof AbstractThreadGroup) {
                 AbstractThreadGroup tg = (AbstractThreadGroup) parentController;
                 tg.startNextLoop();
@@ -351,7 +347,7 @@ public class JMeterThread implements Run
                 parentController.triggerEndOfLoop();
             }
         }
-        if(transactionSampler!=null) {
+        if(transactionSampler != null) {
             processSampler(transactionSampler, null, threadContext);
         }
     }

Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/ListenerNotifier.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/ListenerNotifier.java?rev=1719514&r1=1719513&r2=1719514&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/ListenerNotifier.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/ListenerNotifier.java Fri Dec 11 19:53:31
2015
@@ -41,26 +41,10 @@ import org.apache.jmeter.testelement.Tes
 import org.apache.jorphan.logging.LoggingManager;
 import org.apache.log.Logger;
 
-///**
-// * The <code>ListenerNotifier</code> thread is responsible for performing
-// * asynchronous notifications that a sample has occurred. Each time a sample
-// * occurs, the <code>addLast</code> method should be called to add the sample
-// * and its list of listeners to the notification queue. This thread will then
-// * notify those listeners asynchronously at some future time.
-// * <p>
-// * In the current implementation, the notifications will be made in batches,
-// * with 2 seconds between the beginning of successive batches. If the notifier
-// * thread starts to get behind, the priority of the thread will be increased in
-// * an attempt to help it to keep up.
-// *
-// * @see org.apache.jmeter.samplers.SampleListener
-// *
-// */
 /**
  * Processes sample events.
  * The current implementation processes events in the calling thread
  * using {@link #notifyListeners(SampleEvent, List)}
- * The other code is not used currently, so is commented out.
  */
 public class ListenerNotifier {
     private static final Logger log = LoggingManager.getLoggerForClass();

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java?rev=1719514&r1=1719513&r2=1719514&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java Fri Dec 11 19:53:31 2015
@@ -253,20 +253,6 @@ public abstract class SSLManager {
     public static final synchronized SSLManager getInstance() {
         if (null == SSLManager.manager) {
             SSLManager.manager = new JsseSSLManager(null);
-//          if (SSLManager.isSSLSupported) {
-//              String classname = null;
-//              classname = "org.apache.jmeter.util.JsseSSLManager"; // $NON-NLS-1$
-//
-//              try {
-//                  Class clazz = Class.forName(classname);
-//                  Constructor con = clazz.getConstructor(new Class[] { Provider.class });
-//                  SSLManager.manager = (SSLManager) con.newInstance(new Object[] { SSLManager.sslProvider
});
-//              } catch (Exception e) {
-//                  log.error("Could not create SSLManager instance", e); // $NON-NLS-1$
-//                  SSLManager.isSSLSupported = false;
-//                  return null;
-//              }
-//          }
         }
 
         return SSLManager.manager;

Modified: jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java?rev=1719514&r1=1719513&r2=1719514&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
(original)
+++ jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
Fri Dec 11 19:53:31 2015
@@ -1066,11 +1066,11 @@ public class SmtpPanel extends JPanel {
 
     private void clearHeaderFields() {
         headerFieldName.setVisible(false);
-           headerFieldValue.setVisible(false);
+        headerFieldValue.setVisible(false);
 
         for (Iterator<JButton> iterator = removeButtons.keySet().iterator(); iterator.hasNext();)
{
             JButton removeButton = iterator.next();
-               JTextField headerName = removeButtons.get(removeButton);
+            JTextField headerName = removeButtons.get(removeButton);
             JTextField headerValue = headerFields.get(headerName);
 
             headerFieldsPanel.remove(headerName);



Mime
View raw message