You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2019/06/04 19:40:15 UTC
[metamodel-membrane] 05/05: METAMODEL-1212: Cosmetic fixes to CORS
feature.
This is an automated email from the ASF dual-hosted git repository.
kaspersor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/metamodel-membrane.git
commit 1f1720f374833647ca4e9912a15faf3e6ae79f9b
Author: Kasper Sørensen <i....@gmail.com>
AuthorDate: Tue Jun 4 21:39:52 2019 +0200
METAMODEL-1212: Cosmetic fixes to CORS feature.
Closes #22
---
CHANGES.md | 6 +++++-
.../main/java/org/apache/metamodel/membrane/server/WebServer.java | 5 ++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 0d5c6c6..41b6f20 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,8 @@
-### Apache MetaModel Membrane 0.1 [work in progress]
+### Apache MetaModel Membrane [work in progress]
+
+* [METAMODEL-1212] - Added support for CORS headers.
+
+### Apache MetaModel Membrane 0.1
* [METAMODEL-1153] - Added endpoints for deleting data sources.
* [METAMODEL-1147] - Implemented Swagger codegen to build model classes from swagger file.
diff --git a/undertow/src/main/java/org/apache/metamodel/membrane/server/WebServer.java b/undertow/src/main/java/org/apache/metamodel/membrane/server/WebServer.java
index 4ec6054..03a0dce 100644
--- a/undertow/src/main/java/org/apache/metamodel/membrane/server/WebServer.java
+++ b/undertow/src/main/java/org/apache/metamodel/membrane/server/WebServer.java
@@ -88,12 +88,11 @@ public class WebServer {
final DeploymentManager manager = Servlets.defaultContainer().addDeployment(deployment);
manager.deploy();
- HttpHandler handler;
+ final HttpHandler handler;
if (enableCors) {
CorsHandlers corsHandlers = new CorsHandlers();
handler = corsHandlers.allowOrigin(manager.start());
- }
- else {
+ } else {
handler = manager.start();
}