Agent findbugs fixes #945
Merged
Agent findbugs fixes #945
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
littleaj
commented
Jun 12, 2019
| @@ -120,11 +120,14 @@ private static void appendJarsToBootstrapClassLoader(Instrumentation inst) throw | |||
|
|
|||
| String agentJarName = null; | |||
| File agentFolder = new File(agentJarLocation); | |||
| for (File file : agentFolder.listFiles()) { | |||
There was a problem hiding this comment.
listFiles() returns null if not a directory. The path should be a directory, but we don't verify so I'll let this fall through
| @@ -131,7 +131,7 @@ public AgentConfiguration parseConfigurationFile(String baseFolder) { | |||
| setBuiltInInstrumentation(agentConfiguration, instrumentationTag); | |||
|
|
|||
| NodeList addClasses = getAllClassesToInstrument(instrumentationTag); | |||
| if (addClasses == null) { | |||
| if (addClasses.getLength() == 0) { // can't be null; if empty, return | |||
There was a problem hiding this comment.
Element.getElementsByTagName returns in empty NodeList in place of null
| @@ -242,7 +238,7 @@ private void setBuiltInInstrumentation(AgentConfigurationDefaultImpl agentConfig | |||
| nodes = builtInElement.getElementsByTagName(MAX_STATEMENT_QUERY_LIMIT_TAG); | |||
| builtInConfigurationBuilder.setSqlMaxQueryLimitInMS(XmlParserUtils.getLong(XmlParserUtils.getFirst(nodes), MAX_STATEMENT_QUERY_LIMIT_TAG)); | |||
|
|
|||
| new BuiltInInstrumentedClassesBuilder().setSimpleBuiltInClasses(builtInConfigurationBuilder, builtInElement); | |||
There was a problem hiding this comment.
This method is static
| @@ -429,7 +421,7 @@ private void addMethods(ClassInstrumentationData classData, Element eClassNode) | |||
| valueStr = methodElement.getAttribute(THRESHOLD_ATTRIBUTE); | |||
| if (!StringUtils.isNullOrEmpty(valueStr)) { | |||
| try { | |||
| thresholdInMS = Long.valueOf(valueStr); | |||
There was a problem hiding this comment.
Unnecessary unbox rebox
| return Long.parseLong(strValue); | ||
| } catch (NumberFormatException nfe) { | ||
| InternalLogger.INSTANCE.warn("Invalid attribute value. Expected number but was '%s'", strValue); | ||
| } |
There was a problem hiding this comment.
same here (unbox/rebox), but we need a try/catch
trask
approved these changes
Jun 12, 2019
littleaj
force-pushed
the
agent_findbugs_fixes
branch
from
2451bb6
to
25a4484
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.