From 504aa620943ae6fb10037784a4768d3750858b42 Mon Sep 17 00:00:00 2001 From: Felix Schumacher Date: Thu, 8 Jan 2015 19:51:32 +0100 Subject: [PATCH] Don't add orderedLibs attribute, if it is null. ReplicatedContext fails otherwise --- java/org/apache/tomcat/util/descriptor/web/WebXml.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java/org/apache/tomcat/util/descriptor/web/WebXml.java b/java/org/apache/tomcat/util/descriptor/web/WebXml.java index 55bada9..fad2c18 100644 --- a/java/org/apache/tomcat/util/descriptor/web/WebXml.java +++ b/java/org/apache/tomcat/util/descriptor/web/WebXml.java @@ -2270,8 +2270,10 @@ public class WebXml { orderedJarFileNames.add(fragment.getJarName()); } } - servletContext.setAttribute(ServletContext.ORDERED_LIBS, - orderedJarFileNames); + if (orderedJarFileNames != null) { + servletContext.setAttribute(ServletContext.ORDERED_LIBS, + orderedJarFileNames); + } } // The remainder of the processing needs to know about container -- 1.9.1