NPE protection on WebInfConfiguration.deconfigure() #5481
Merged
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
Contributor
joakime
commented
Oct 20, 2020
joakime
commented
- NPE protection on IO.delete(File)
- Fail in jetty-maven-plugin if unable to create temp directory.
- NPE protection in WebInfConfiguration.deconfigure()
- Removing Temp dir forced deletion in WebInfConfiguration.configureTempDirectory()
Signed-off-by: Joakim Erdfelt <[email protected]>
…ectory. Signed-off-by: Joakim Erdfelt <[email protected]>
+ Removing Temp dir deletion in configureTempDirectory() Signed-off-by: Joakim Erdfelt <[email protected]>
janbartel
requested changes
Oct 20, 2020
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
Show resolved
Hide resolved
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
Show resolved
Hide resolved
gregw
requested changes
Oct 20, 2020
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
Show resolved
Hide resolved
| @@ -355,7 +355,7 @@ public void configure(WebAppContext context) throws Exception | |||
| public void deconfigure(WebAppContext context) throws Exception | |||
| { | |||
| //if we're not persisting the temp dir contents delete it | |||
| if (!context.isPersistTempDirectory()) | |||
| if (!context.isPersistTempDirectory() && context.getTempDirectory() != null && context.getTempDirectory().exists()) | |||
There was a problem hiding this comment.
assign getTempDirectory() to a variable
Signed-off-by: Joakim Erdfelt <[email protected]>
joakime
commented
Oct 20, 2020
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
Show resolved
Hide resolved
gregw
reviewed
Oct 20, 2020
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
Show resolved
Hide resolved
gregw
reviewed
Oct 20, 2020
| //if dir exists and we don't want it persisted, delete it | ||
| if (dir.exists() && !context.isPersistTempDirectory()) | ||
| // if dir exists and we don't want it persisted, delete it | ||
| if (!context.isPersistTempDirectory() && dir.exists() && !IO.delete(dir)) |
There was a problem hiding this comment.
how hard is it to check if it is empty or not. if it is empty, it would be good to avoid deleting it.
There was a problem hiding this comment.
Not to terrible to check if empty.
Let me try.
There was a problem hiding this comment.
This has been implemented and is available in this PR.
gregw
approved these changes
Oct 20, 2020
Signed-off-by: Joakim Erdfelt <[email protected]>
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.