Skip to content

Commit 4313a39

Browse files
author
Max Shaposhnik
authored
CODENVY-1826; restore filter order; (eclipse-che#5009)
1 parent f95f8af commit 4313a39

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

wsagent/che-wsagent-core/src/main/java/org/eclipse/che/wsagent/server/CheWsAgentServletModule.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import com.google.inject.servlet.ServletModule;
1414

15+
import org.eclipse.che.api.core.cors.CheCorsFilter;
1516
import org.eclipse.che.inject.DynaModule;
1617
import org.everrest.guice.servlet.GuiceEverrestServlet;
1718

@@ -27,6 +28,7 @@
2728
public class CheWsAgentServletModule extends ServletModule {
2829
@Override
2930
protected void configureServlets() {
31+
filter("/*").through(CheCorsFilter.class);
3032
serveRegex("^/api((?!(/(ws|eventbus)($|/.*)))/.*)").with(GuiceEverrestServlet.class);
3133
}
3234
}

wsagent/che-wsagent-core/src/main/java/org/eclipse/che/wsagent/server/WsAgentServletModule.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
import com.google.inject.servlet.ServletModule;
1414

15-
import org.eclipse.che.api.core.cors.CheCorsFilter;
1615
import org.eclipse.che.inject.DynaModule;
1716
import org.everrest.websockets.WSConnectionTracker;
1817

@@ -26,7 +25,5 @@ public class WsAgentServletModule extends ServletModule {
2625
@Override
2726
protected void configureServlets() {
2827
getServletContext().addListener(new WSConnectionTracker());
29-
filter("/*").through(CheCorsFilter.class);
30-
3128
}
3229
}

0 commit comments

Comments
 (0)