Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for several string formats, they are based on static analysis. #6306

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Fixes for several string formats, they are based on static analysis. #6306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
441ad6e
Fixes for several string formats, they are based on static analysis.
dk2k Jun 30, 2024
23641f6
Removed several collections which are updated, but seem to be never a…
dk2k Jun 30, 2024
e557c1c
Revert "Removed several collections which are updated, but seem to be…
dk2k Jun 30, 2024
bc06523
fixed placeholders
dk2k Aug 6, 2024
5ee9bbc
Update src/protocol/java/src/main/java/org/apache/jmeter/protocol/jav…
dk2k Oct 21, 2024
3eaee4b
Merge branch 'apache:master' into dk2k_fix_string_format
dk2k Oct 21, 2024
ec9d885
Restored a placeholder
dk2k Nov 23, 2024
fc2f147
Update src/protocol/java/src/main/java/org/apache/jmeter/protocol/jav…
dk2k Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...tocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ protected void computeFromPostBody(HTTPSamplerBase sampler,
HTTPFileArg [] files = {new HTTPFileArg(out.getPath(),"",contentType)};
sampler.setHTTPFiles(files);
} catch (IOException e) {
log.warn("Could not create binary file: {}", e);
log.warn("Could not create binary file", e);
dk2k marked this conversation as resolved.
Show resolved Hide resolved
}
} else {
// Just put the whole postbody as the value of a parameter
Expand Down
4 changes: 2 additions & 2 deletions src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ private void initClass() {
javaClass = Class.forName(name, false, Thread.currentThread().getContextClassLoader());
Method method = javaClass.getMethod("teardownTest", JavaSamplerContext.class);
isToBeRegistered = !method.getDeclaringClass().equals(AbstractJavaSamplerClient.class);
log.info("Created class: {}. Uses tearDownTest: ", name, isToBeRegistered);
log.info("Created class: {}. Uses tearDownTest: {}", name, isToBeRegistered);
} catch (Exception e) {
log.error("{}\tException initialising: ", whoAmI(), name, e);
log.error("{}\tException initialising: {}", whoAmI(), name, e);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While the text in the message looks like it is missing a placeholder, I would refrain from adding it here. Adding a placeholder will loose the stacktrace, which could be helpful identifying the root cause.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I restored this placeholder

}

}
Expand Down
2 changes: 1 addition & 1 deletion src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ private void closeSocket(String socketKey) {
try {
con.close();
} catch (IOException e) {
log.warn("Error closing socket {}", e); //$NON-NLS-1$
log.warn("Error closing socket", e); //$NON-NLS-1$
dk2k marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
Expand Down
Loading