Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
f975e8d3
Commit
f975e8d3
authored
Nov 07, 2017
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10941 from izeye:null-check
* pr/10941: Add missing null check in FileSystemWatcher.stopAfter()
parents
373f7db3
b965171b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
FileSystemWatcher.java
...gframework/boot/devtools/filewatch/FileSystemWatcher.java
+1
-1
No files found.
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java
View file @
f975e8d3
...
@@ -194,7 +194,7 @@ public class FileSystemWatcher {
...
@@ -194,7 +194,7 @@ public class FileSystemWatcher {
}
}
this
.
watchThread
=
null
;
this
.
watchThread
=
null
;
}
}
if
(
Thread
.
currentThread
()
!=
thread
)
{
if
(
thread
!=
null
&&
Thread
.
currentThread
()
!=
thread
)
{
try
{
try
{
thread
.
join
();
thread
.
join
();
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment