From 03fede0de3699a0a663d244c21ab1e3288573133 Mon Sep 17 00:00:00 2001
From: Andrew Donald Kennedy <andrew.kennedy@cloudsoftcorp.com>
Date: Mon, 15 Aug 2016 12:18:32 +0100
Subject: [PATCH] Fix NPE generating Nginx config when no SSL configured

---
 .../entity/proxy/nginx/NginxDefaultConfigGenerator.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxDefaultConfigGenerator.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxDefaultConfigGenerator.java
index bbe81aa8c..341bf67bf 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxDefaultConfigGenerator.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxDefaultConfigGenerator.java
@@ -78,7 +78,9 @@ public String generateConfigFile(NginxDriver driver, NginxController nginx) {
             config.append("  }\n");
             config.append("  server {\n");
             config.append(getCodeForServerConfig());
-            appendCodeForProxySSLConfig(nginx.getId(), config, "    ", globalSslConfig);
+            if (globalSslConfig != null) {
+                appendCodeForProxySSLConfig(nginx.getId(), config, "    ", globalSslConfig);
+            }
             config.append("    listen "+nginx.getPort()+";\n");
             if (nginx.getDomain()!=null)
                 config.append("    server_name "+nginx.getDomain()+";\n");