svn commit: r1514495 - in /jmeter/trunk: src/core/org/apache/jmeter/samplers/SampleSenderFactory.java xdocs/changes.xml

[pm...@apache.org]

Author: pmouawad
Date: Thu Aug 15 21:09:26 2013
New Revision: 1514495

URL: http://svn.apache.org/r1514495
Log:
Bug 55424 - Add Stripping to existing SampleSenders
Bugzilla Id: 55424

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java?rev=1514495&r1=1514494&r2=1514495&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java Thu Aug 15 21:09:26 2013
@@ -42,8 +42,12 @@ public class SampleSenderFactory {
 
     private static final String MODE_ASYNCH = "Asynch"; // $NON-NLS-1$
 
+    private static final String MODE_STRIPPED_ASYNCH = "StrippedAsynch"; // $NON-NLS-1$
+
     private static final String MODE_DISKSTORE = "DiskStore"; // $NON-NLS-1$
 
+    private static final String MODE_STRIPPED_DISKSTORE = "StrippedDiskStore"; // $NON-NLS-1$
+
     /**
      * Checks for the Jmeter property mode and returns the required class.
      *
@@ -64,20 +68,24 @@ public class SampleSenderFactory {
         } else if (type.equalsIgnoreCase(MODE_BATCH)) {
             BatchSampleSender b = new BatchSampleSender(listener);
             return b;
+        }  else if(type.equalsIgnoreCase(MODE_STRIPPED_BATCH)) {
+            return new DataStrippingSampleSender(new BatchSampleSender(listener));
         } else if (type.equalsIgnoreCase(MODE_STATISTICAL)) {
             StatisticalSampleSender s = new StatisticalSampleSender(listener);
             return s;
         } else if (type.equalsIgnoreCase(MODE_STANDARD)) {
             StandardSampleSender s = new StandardSampleSender(listener);
             return s;
-        }  else if(type.equalsIgnoreCase(MODE_STRIPPED_BATCH)) {
-            return new DataStrippingSampleSender(new BatchSampleSender(listener));
         } else if(type.equalsIgnoreCase(MODE_STRIPPED)){
             return new DataStrippingSampleSender(listener);
         } else if(type.equalsIgnoreCase(MODE_ASYNCH)){
             return new AsynchSampleSender(listener);
+        } else if(type.equalsIgnoreCase(MODE_STRIPPED_ASYNCH)) {
+            return new DataStrippingSampleSender(new AsynchSampleSender(listener));
         } else if(type.equalsIgnoreCase(MODE_DISKSTORE)){
             return new DiskStoreSampleSender(listener);
+        } else if(type.equalsIgnoreCase(MODE_STRIPPED_DISKSTORE)){
+            return new DataStrippingSampleSender(new DiskStoreSampleSender(listener));
         } else {
             // should be a user provided class name
             SampleSender s = null;

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1514495&r1=1514494&r2=1514495&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Thu Aug 15 21:09:26 2013
@@ -366,6 +366,7 @@ Previously the default was 1, which coul
 <li><bugzilla>55236</bugzilla> - Templates - provide button to reload template details.</li>
 <li><bugzilla>55237</bugzilla> - Template system should support relative fileName entries.</li>
 <li><bugzilla>55423</bugzilla> - BatchSampleSender: Reduce locking granularity by moving listener.processBatch outside of synchronized block</li>
+<li><bugzilla>55424</bugzilla> - Add Stripping to existing SampleSenders</li>
 </ul>
 
 <h2>Non-functional changes</h2>