svn commit: r1814104 - in /jmeter/trunk/src/protocol: jms/org/apache/jmeter/protocol/jms/control/gui/ ldap/org/apache/jmeter/protocol/ldap/sampler/ mongodb/org/apache/jmeter/protocol/mongodb/config/

[pm...@apache.org]

Author: pmouawad
Date: Thu Nov  2 20:08:03 2017
New Revision: 1814104

URL: http://svn.apache.org/viewvc?rev=1814104&view=rev
Log:
Removed commented out code (part 3)
Contributed by Graham Russell
This comments #319

Modified:
    jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java
    jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java
    jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapClient.java
    jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java

Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java?rev=1814104&r1=1814103&r2=1814104&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java Thu Nov  2 20:08:03 2017
@@ -189,12 +189,7 @@ public class JMSSamplerGui extends Abstr
         providerUrl.setText(sampler.getContextProvider());
 
         jmsPropertiesPanel.configure(sampler.getJMSProperties());
-        // (TestElement)
-        // el.getProperty(JMSSampler.JMS_PROPERTIES).getObjectValue());
-
         jndiPropertiesPanel.configure(sampler.getJNDIProperties());
-        // (TestElement)
-        // el.getProperty(JMSSampler.JNDI_PROPERTIES).getObjectValue());
     }
 
     /**

Modified: jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java?rev=1814104&r1=1814103&r2=1814104&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java (original)
+++ jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java Thu Nov  2 20:08:03 2017
@@ -467,9 +467,6 @@ public class LDAPSampler extends Abstrac
             isSuccessful = true;
         } catch (Exception ex) {
             log.error("Ldap client - ", ex);
-            // Could time this
-            // res.sampleEnd();
-            // if sampleEnd() is not called, elapsed time will remain zero
             res.setResponseCode("500");// TODO distinguish errors better //$NON-NLS-1$
             res.setResponseMessage(ex.toString());
             isSuccessful = false;

Modified: jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapClient.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapClient.java?rev=1814104&r1=1814103&r2=1814104&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapClient.java (original)
+++ jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapClient.java Thu Nov  2 20:08:03 2017
@@ -23,7 +23,6 @@ import java.util.Hashtable;
 import javax.naming.Context;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
-// import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttributes;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;

Modified: jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java?rev=1814104&r1=1814103&r2=1814104&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java (original)
+++ jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java Thu Nov  2 20:08:03 2017
@@ -63,25 +63,6 @@ public class MongoSourceElement
     private int writeOperationTimeout;
     private boolean continueOnInsertError;
     
-//    public final static String CONNECTION = "MongoSourceElement.connection"; //$NON-NLS-1$
-//    public final static String SOURCE = "MongoSourceElement.source"; //$NON-NLS-1$
-//
-//    public final static String AUTO_CONNECT_RETRY = "MongoSourceElement.autoConnectRetry"; //$NON-NLS-1$
-//    public final static String CONNECTIONS_PER_HOST = "MongoSourceElement.connectionsPerHost"; //$NON-NLS-1$
-//    public final static String CONNECT_TIMEOUT = "MongoSourceElement.connectTimeout"; //$NON-NLS-1$
-//    public final static String CONTINUE_ON_INSERT_ERROR = "MongoSourceElement.continueOnInsertError"; //$NON-NLS-1$
-//    public final static String MAX_AUTO_CONNECT_RETRY_TIME = "MongoSourceElement.maxAutoConnectRetryTime"; //$NON-NLS-1$
-//    public final static String MAX_WAIT_TIME = "MongoSourceElement.maxWaitTime"; //$NON-NLS-1$
-//    public final static String SOCKET_TIMEOUT = "MongoSourceElement.socketTimeout"; //$NON-NLS-1$
-//    public final static String SOCKET_KEEP_ALIVE = "MongoSourceElement.socketKeepAlive"; //$NON-NLS-1$
-//    public final static String THREADS_ALLOWED_TO_BLOCK_MULTIPLIER = "MongoSourceElement.threadsAllowedToBlockForConnectionMultiplier"; //$NON-NLS-1$
-//
-//    public final static String FSYNC = "MongoSourceElement.fsync"; //$NON-NLS-1$
-//    public final static String SAFE = "MongoSourceElement.safe"; //$NON-NLS-1$
-//    public final static String WAIT_FOR_JOURNALING = "MongoSourceElement.waitForJournaling"; //$NON-NLS-1$
-//    public final static String WRITE_OPERATION_NUMBER_OF_SERVERS = "MongoSourceElement.writeOperationNumberOfServers"; //$NON-NLS-1$
-//    public final static String WRITE_OPERATION_TIMEOUT = "MongoSourceElement.writeOperationTimeout"; //$NON-NLS-1$
-
     public String getTitle() {
         return this.getName();
     }