Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#1857 populate excludedInterceptors in doInitParams #1876

Merged
merged 1 commit into from
Feb 24, 2015
Merged

#1857 populate excludedInterceptors in doInitParams #1876

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereFramework.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,11 +1150,6 @@ protected void configureAtmosphereInterceptor(ServletConfig sc) {
if (s == null || !"true".equalsIgnoreCase(s)) {
logger.info("Installing Default AtmosphereInterceptors");

s = sc.getInitParameter(ApplicationConfig.DISABLE_ATMOSPHEREINTERCEPTORS);
if (s != null) {
excludedInterceptors.addAll(Arrays.asList(s.trim().replace(" ", "").split(",")));
}

// We must reposition
LinkedList<AtmosphereInterceptor> copy = null;
if (!interceptors.isEmpty()) {
Expand Down Expand Up @@ -1450,6 +1445,11 @@ protected void doInitParams(ServletConfig sc, boolean reconfigure) {
if (s != null) {
defaultSerializerClassName = s;
}

s = sc.getInitParameter(ApplicationConfig.DISABLE_ATMOSPHEREINTERCEPTORS);
if (s != null) {
excludedInterceptors.addAll(Arrays.asList(s.trim().replace(" ", "").split(",")));
}
}

public void loadConfiguration(ServletConfig sc) throws ServletException {
Expand Down