svn commit: r910824 - /jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java

Author: sebb
Date: Wed Feb 17 05:04:26 2010
New Revision: 910824

URL: http://svn.apache.org/viewvc?rev=910824&view=rev
Log:
Fix duplicate child.sampleEnd() calls

Modified:
    jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java

Modified: jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java?rev=910824&r1=910823&r2=910824&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java Wed Feb 17 05:04:26 2010
@@ -180,7 +180,9 @@
                     message.setFlag(Flags.Flag.DELETED, true);
                 }
                 child.setResponseOK();
-                child.sampleEnd();
+                if (child.getEndTime()==0){// Avoid double-call if addSubResult was called.
+                    child.sampleEnd();
+                }
                 parent.addSubResult(child);
             }
 
@@ -261,7 +263,6 @@
                 sr.setSampleLabel("Part: "+j);
                 sr.setContentType(contentType);
                 sr.setEncodingAndType(contentType);
-                sr.setResponseHeaders(bodyPart.getClass().getName());// TODO
                 sr.sampleStart();
                 if (bodyPartContent instanceof InputStream){
                     sr.setResponseData(IOUtils.toByteArray((InputStream) bodyPartContent));