You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/12/22 22:47:19 UTC

svn commit: r1775761 - /jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java

Author: pmouawad
Date: Thu Dec 22 22:47:19 2016
New Revision: 1775761

URL: http://svn.apache.org/viewvc?rev=1775761&view=rev
Log:
Sonar : Fix errors and code smells

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java?rev=1775761&r1=1775760&r2=1775761&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java Thu Dec 22 22:47:19 2016
@@ -41,11 +41,11 @@ public class AsynchSampleSender extends
     private static final Logger log = LoggingManager.getLoggerForClass();
 
     // Create unique object as marker for end of queue
-    private transient static final SampleEvent FINAL_EVENT = new SampleEvent();
+    private static transient final SampleEvent FINAL_EVENT = new SampleEvent();
 
     private static final int DEFAULT_QUEUE_SIZE = 100;
     
-    private static final int serverConfiguredCapacity = JMeterUtils.getPropDefault("asynch.batch.queue.size", DEFAULT_QUEUE_SIZE); // $NON-NLS-1$
+    private static final int SERVER_CONFIGURED_CAPACITY = JMeterUtils.getPropDefault("asynch.batch.queue.size", DEFAULT_QUEUE_SIZE); // $NON-NLS-1$
     
     private final int clientConfiguredCapacity = JMeterUtils.getPropDefault("asynch.batch.queue.size", DEFAULT_QUEUE_SIZE); // $NON-NLS-1$
 
@@ -59,22 +59,6 @@ public class AsynchSampleSender extends
     private transient long queueWaitTime; // how long we had to wait (nanoSeconds)
 
     /**
-     * Processed by the RMI server code.
-     *
-     * @return this
-     * @throws ObjectStreamException never
-     */
-    private Object readResolve() throws ObjectStreamException{
-        int capacity = getCapacity();
-        log.info("Using batch queue size (asynch.batch.queue.size): " + capacity); // server log file
-        queue = new ArrayBlockingQueue<>(capacity);
-        Worker worker = new Worker(queue, listener);
-        worker.setDaemon(true);
-        worker.start();
-        return this;
-    }
-
-    /**
      * @deprecated only for use by test code
      */
     @Deprecated
@@ -88,13 +72,29 @@ public class AsynchSampleSender extends
         this.listener = listener;
         log.info("Using Asynch Remote Sampler for this test run, queue size "+getCapacity());  // client log file
     }
+    
+    /**
+     * Processed by the RMI server code.
+     *
+     * @return this
+     * @throws ObjectStreamException never
+     */
+    protected Object readResolve() throws ObjectStreamException{
+        int capacity = getCapacity();
+        log.info("Using batch queue size (asynch.batch.queue.size): " + capacity); // server log file
+        queue = new ArrayBlockingQueue<>(capacity);
+        Worker worker = new Worker(queue, listener);
+        worker.setDaemon(true);
+        worker.start();
+        return this;
+    }
 
     /**
      * @return capacity
      */
     private int getCapacity() {
         return isClientConfigured() ? 
-                clientConfiguredCapacity : serverConfiguredCapacity;
+                clientConfiguredCapacity : SERVER_CONFIGURED_CAPACITY;
     }
     
     @Override