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:14 UTC
[metamodel-membrane] 04/05: Update WebServer.java
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 0aae74fd9f8d29b86249359746d31b5e06bb71e5
Author: Nicola Vitucci <ni...@gmail.com>
AuthorDate: Thu May 30 16:26:49 2019 +0100
Update WebServer.java
---
.../java/org/apache/metamodel/membrane/server/WebServer.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
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 d74c953..4ec6054 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
@@ -6,9 +6,9 @@
* to you 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ * 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
@@ -53,7 +53,7 @@ public class WebServer {
final String portEnv = System.getenv("MEMBRANE_HTTP_PORT");
final int port = Strings.isNullOrEmpty(portEnv) ? DEFAULT_PORT : Integer.parseInt(portEnv);
- final String enableCorsEnv = System.getenv("ENABLE_CORS");
+ final String enableCorsEnv = System.getenv("MEMBRANE_ENABLE_CORS");
final boolean enableCors = !Strings.isNullOrEmpty(enableCorsEnv);
logger.info("Apache MetaModel Membrane server initiating on port {}", port);
@@ -93,8 +93,9 @@ public class WebServer {
CorsHandlers corsHandlers = new CorsHandlers();
handler = corsHandlers.allowOrigin(manager.start());
}
- else
+ else {
handler = manager.start();
+ }
final Undertow server = Undertow.builder().addHttpListener(port, "0.0.0.0").setHandler(handler).build();
server.start();