From 91a2eaf51c92941ef97a33ecfd8a9e987950c132 Mon Sep 17 00:00:00 2001 From: jvangaalen Date: Wed, 11 Dec 2024 23:05:49 +0100 Subject: [PATCH] Store raw body in responseData and only decompress when responseBody is accessed --- .../org/apache/jmeter/threads/TestCompiler.java | 13 +------------ .../java/org/apache/jmeter/junit/JMeterTest.java | 3 +-- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java b/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java index 233cbb2ad17..f212dda90a9 100644 --- a/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java +++ b/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java @@ -115,21 +115,10 @@ public SamplePackage configureTransactionSampler(TransactionSampler transactionS } /** - * Reset pack to its initial state and clean up transaction results if needed + * Reset pack to its initial state * @param pack the {@link SamplePackage} to reset */ public void done(SamplePackage pack) { - Sampler sampler = pack.getSampler(); - if (sampler instanceof TransactionSampler) { - TransactionSampler transactionSampler = (TransactionSampler) sampler; - TransactionController controller = transactionSampler.getTransactionController(); - if (transactionSampler.isTransactionDone()) { - // Create new sampler for next iteration - TransactionSampler newSampler = new TransactionSampler(controller, transactionSampler.getName()); - SamplePackage newPack = transactionControllerConfigMap.get(controller); - newPack.setSampler(newSampler); - } - } pack.recoverRunningVersion(); } diff --git a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java index 798f83ce62a..5fd25546bb7 100644 --- a/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java +++ b/src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java @@ -581,8 +581,7 @@ static Stream serializableObjects() throws Throwable { return getObjects(Serializable.class) .stream() .map(Serializable.class::cast) - .filter(o -> !o.getClass().getName().endsWith("_Stub")) - .filter(o -> o.getClass().getName().startsWith("org.apache.jmeter.")); + .filter(o -> !o.getClass().getName().endsWith("_Stub")); } /*