From aaf1ba8fa767559a452b34ad54d126cdfe012cc2 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 28 Aug 2012 06:38:06 +0000
Subject: [PATCH] SP-239, SWE-6: bug fixed
SVN: 26461
---
.../server/coreplugin/JettyWebAppPluginInjector.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/JettyWebAppPluginInjector.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/JettyWebAppPluginInjector.java
index e2386da9966..a2efbf13883 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/JettyWebAppPluginInjector.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/JettyWebAppPluginInjector.java
@@ -98,6 +98,10 @@ public class JettyWebAppPluginInjector
if (webappName.startsWith(".") == false)
{
Properties webappProps = webappProperties.get(webappName);
+ if (webappProps == null)
+ {
+ return;
+ }
String f = webappProps.getProperty(WEB_APP_FOLDER_PROPERTY);
webappToFoldersMap.put(webappName, new File(f));
}
@@ -119,6 +123,10 @@ public class JettyWebAppPluginInjector
for (String webapp : webapps)
{
File folder = webappToFoldersMap.get(webapp);
+ if (folder == null)
+ {
+ continue;
+ }
String path = folder.getAbsolutePath();
for (File target : targets)
{
--
GitLab