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
39d73821
Commit
39d73821
authored
May 11, 2018
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2.0.x'
parents
079b67c5
972d9527
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
74 additions
and
0 deletions
+74
-0
SpringBootExceptionHandler.java
.../org/springframework/boot/SpringBootExceptionHandler.java
+3
-0
SpringBootExceptionHandlerTests.java
...springframework/boot/SpringBootExceptionHandlerTests.java
+71
-0
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringBootExceptionHandler.java
View file @
39d73821
...
@@ -86,6 +86,9 @@ class SpringBootExceptionHandler implements UncaughtExceptionHandler {
...
@@ -86,6 +86,9 @@ class SpringBootExceptionHandler implements UncaughtExceptionHandler {
* @return {@code true} if the exception contains a log configuration message
* @return {@code true} if the exception contains a log configuration message
*/
*/
private
boolean
isLogConfigurationMessage
(
Throwable
ex
)
{
private
boolean
isLogConfigurationMessage
(
Throwable
ex
)
{
if
(
ex
instanceof
InvocationTargetException
)
{
return
isLogConfigurationMessage
(
ex
.
getCause
());
}
String
message
=
ex
.
getMessage
();
String
message
=
ex
.
getMessage
();
if
(
message
!=
null
)
{
if
(
message
!=
null
)
{
for
(
String
candidate
:
LOG_CONFIGURATION_MESSAGES
)
{
for
(
String
candidate
:
LOG_CONFIGURATION_MESSAGES
)
{
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringBootExceptionHandlerTests.java
0 → 100644
View file @
39d73821
/*
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org
.
springframework
.
boot
;
import
java.lang.Thread.UncaughtExceptionHandler
;
import
java.lang.reflect.InvocationTargetException
;
import
org.junit.Test
;
import
static
org
.
mockito
.
Matchers
.
same
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
verifyZeroInteractions
;
/**
* Tests for {@link SpringBootExceptionHandler}.
*
* @author Henri Tremblay
* @author Andy Wilkinson
*/
public
class
SpringBootExceptionHandlerTests
{
private
final
UncaughtExceptionHandler
parent
=
mock
(
UncaughtExceptionHandler
.
class
);
private
final
SpringBootExceptionHandler
handler
=
new
SpringBootExceptionHandler
(
this
.
parent
);
@Test
public
void
uncaughtExceptionDoesNotForwardLoggedErrorToParent
()
{
Thread
thread
=
Thread
.
currentThread
();
Exception
ex
=
new
Exception
();
this
.
handler
.
registerLoggedException
(
ex
);
this
.
handler
.
uncaughtException
(
thread
,
ex
);
verifyZeroInteractions
(
this
.
parent
);
}
@Test
public
void
uncaughtExceptionForwardsLogConfigurationErrorToParent
()
{
Thread
thread
=
Thread
.
currentThread
();
Exception
ex
=
new
Exception
(
"[stuff] Logback configuration error detected [stuff]"
);
this
.
handler
.
registerLoggedException
(
ex
);
this
.
handler
.
uncaughtException
(
thread
,
ex
);
verify
(
this
.
parent
).
uncaughtException
(
same
(
thread
),
same
(
ex
));
}
@Test
public
void
uncaughtExceptionForwardsWrappedLogConfigurationErrorToParent
()
{
Thread
thread
=
Thread
.
currentThread
();
Exception
ex
=
new
InvocationTargetException
(
new
Exception
(
"[stuff] Logback configuration error detected [stuff]"
,
new
Exception
()));
this
.
handler
.
registerLoggedException
(
ex
);
this
.
handler
.
uncaughtException
(
thread
,
ex
);
verify
(
this
.
parent
).
uncaughtException
(
same
(
thread
),
same
(
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