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
811bd32c
Commit
811bd32c
authored
Nov 07, 2013
by
Dave Syer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More sensible signature for servlet initializer
parent
1f922f49
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
SampleWebSocketsApplication.java
...samples/websocket/config/SampleWebSocketsApplication.java
+2
-2
SpringBootServletInitializer.java
...pringframework/boot/web/SpringBootServletInitializer.java
+3
-2
No files found.
spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/config/SampleWebSocketsApplication.java
View file @
811bd32c
...
@@ -36,8 +36,8 @@ import org.springframework.web.socket.support.PerConnectionWebSocketHandler;
...
@@ -36,8 +36,8 @@ import org.springframework.web.socket.support.PerConnectionWebSocketHandler;
public
class
SampleWebSocketsApplication
extends
SpringBootServletInitializer
{
public
class
SampleWebSocketsApplication
extends
SpringBootServletInitializer
{
@Override
@Override
protected
void
configure
(
SpringApplicationBuilder
application
)
{
protected
SpringApplicationBuilder
configure
(
SpringApplicationBuilder
application
)
{
application
.
sources
(
SampleWebSocketsApplication
.
class
);
return
application
.
sources
(
SampleWebSocketsApplication
.
class
);
}
}
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
...
...
spring-boot/src/main/java/org/springframework/boot/web/SpringBootServletInitializer.java
View file @
811bd32c
...
@@ -86,7 +86,7 @@ public abstract class SpringBootServletInitializer implements WebApplicationInit
...
@@ -86,7 +86,7 @@ public abstract class SpringBootServletInitializer implements WebApplicationInit
application
.
initializers
(
new
ServletContextApplicationContextInitializer
(
application
.
initializers
(
new
ServletContextApplicationContextInitializer
(
servletContext
));
servletContext
));
application
.
contextClass
(
AnnotationConfigEmbeddedWebApplicationContext
.
class
);
application
.
contextClass
(
AnnotationConfigEmbeddedWebApplicationContext
.
class
);
configure
(
application
);
application
=
configure
(
application
);
return
(
WebApplicationContext
)
application
.
run
();
return
(
WebApplicationContext
)
application
.
run
();
}
}
...
@@ -99,7 +99,8 @@ public abstract class SpringBootServletInitializer implements WebApplicationInit
...
@@ -99,7 +99,8 @@ public abstract class SpringBootServletInitializer implements WebApplicationInit
* @param application a builder for the application context
* @param application a builder for the application context
* @see SpringApplicationBuilder
* @see SpringApplicationBuilder
*/
*/
protected
void
configure
(
SpringApplicationBuilder
application
)
{
protected
SpringApplicationBuilder
configure
(
SpringApplicationBuilder
application
)
{
return
application
;
}
}
}
}
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