port r2193 (ensure ORDERED_LIBS only set if there is an ordering - a regression from an earlier refactoring)

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/branches/jetty-8@2195 7e9141cc-0065-0410-87d8-b60c137991c4

1 files changed, 11 insertions, 9 deletions

diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaData.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaData.java
index 833341952a..453efaae22 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaData.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaData.java
@@ -258,17 +258,19 @@ public class MetaData
     throws Exception
     {
         // Set the ordered lib attribute
-        List<String> orderedLibs = new ArrayList<String>();
-        for (Resource webInfJar:_orderedWebInfJars)
+        if (_ordering != null)
         {
-            //get just the name of the jar file
-            String fullname = webInfJar.getName();
-            int i = fullname.indexOf(".jar");          
-            int j = fullname.lastIndexOf("/", i);
-            orderedLibs.add(fullname.substring(j+1,i+4));
+            List<String> orderedLibs = new ArrayList<String>();
+            for (Resource webInfJar:_orderedWebInfJars)
+            {
+                //get just the name of the jar file
+                String fullname = webInfJar.getName();
+                int i = fullname.indexOf(".jar");          
+                int j = fullname.lastIndexOf("/", i);
+                orderedLibs.add(fullname.substring(j+1,i+4));
+            }
+            context.setAttribute(ServletContext.ORDERED_LIBS, orderedLibs);
         }
-        context.setAttribute(ServletContext.ORDERED_LIBS, orderedLibs);
-        
 
         // set the webxml version
         if (_webXmlRoot != null)