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
a76005e8
Commit
a76005e8
authored
Oct 04, 2017
by
dreis2211
Committed by
Phillip Webb
Oct 10, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove concatenations with empty string
Closes gh-10512
parent
f35af88d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
WebRequestTraceFilter.java
...ngframework/boot/actuate/trace/WebRequestTraceFilter.java
+1
-1
StopMojo.java
...rc/main/java/org/springframework/boot/maven/StopMojo.java
+1
-1
No files found.
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java
View file @
a76005e8
...
@@ -214,7 +214,7 @@ public class WebRequestTraceFilter extends OncePerRequestFilter implements Order
...
@@ -214,7 +214,7 @@ public class WebRequestTraceFilter extends OncePerRequestFilter implements Order
private
void
addTimeTaken
(
Map
<
String
,
Object
>
trace
,
long
startTime
)
{
private
void
addTimeTaken
(
Map
<
String
,
Object
>
trace
,
long
startTime
)
{
long
timeTaken
=
System
.
nanoTime
()
-
startTime
;
long
timeTaken
=
System
.
nanoTime
()
-
startTime
;
add
(
trace
,
Include
.
TIME_TAKEN
,
"timeTaken"
,
add
(
trace
,
Include
.
TIME_TAKEN
,
"timeTaken"
,
""
+
TimeUnit
.
NANOSECONDS
.
toMillis
(
timeTaken
));
String
.
valueOf
(
TimeUnit
.
NANOSECONDS
.
toMillis
(
timeTaken
)
));
}
}
@SuppressWarnings
(
"unchecked"
)
@SuppressWarnings
(
"unchecked"
)
...
...
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StopMojo.java
View file @
a76005e8
...
@@ -128,7 +128,7 @@ public class StopMojo extends AbstractMojo {
...
@@ -128,7 +128,7 @@ public class StopMojo extends AbstractMojo {
}
}
catch
(
InstanceNotFoundException
ex
)
{
catch
(
InstanceNotFoundException
ex
)
{
throw
new
MojoExecutionException
(
throw
new
MojoExecutionException
(
"Spring application lifecycle JMX bean not found (fork is "
+
""
"Spring application lifecycle JMX bean not found (fork is "
+
this
.
fork
+
"). Could not stop application gracefully"
,
+
this
.
fork
+
"). Could not stop application gracefully"
,
ex
);
ex
);
}
}
...
...
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