Changeset 36126

Timestamp:

2022-04-04T13:15:06+12:00 (2 years ago)

Author:

kjdon

Message:

check for url is not null - if we have left a servlet definition in, but commented out the mapping, then url will be null

File:

• main/trunk/gli/src/org/greenstone/gatherer/greenstone3/ServletConfiguration.java (modified) (3 diffs)

main/trunk/gli/src/org/greenstone/gatherer/greenstone3/ServletConfiguration.java

@@ -127 +127 @@
         String name = XMLTools.getValue(XMLTools.getNodeFromNamed(map, "servlet-name"));
         String pattern = XMLTools.getValue(XMLTools.getNodeFromNamed(map, "url-pattern"));
-        url_mappings.put(name, pattern);
+        url_mappings.put(name, pattern);
 
     }
@@ -137 +137 @@
         String description = XMLTools.getValue(XMLTools.getNodeFromNamed(servlet, "description"));
         String site = getServletSite(servlet);
-           
         if (site != null) {
         ArrayList this_site = (ArrayList)site_to_servlet_list_map.get(site);
@@ -144 +143 @@
         }
         String url = (String)url_mappings.get(name);
-        if(url.endsWith("/*")) { // truncate trailing /*, e.g. /library/* becomes /library
+                if (url != null) { // if its null, there was no mapping for the servlet
+                  if(url.endsWith("/*")) { // truncate trailing /*, e.g. /library/* becomes /library
             url = url.substring(0, url.length()-2);
-        }
-        this_site.add(url);
-        this.site_to_servlet_list_map.put(site, this_site);
-        this.servlet_to_site_map.put(url, site);
-        }
+                  }
+                  this_site.add(url);
+                  this.site_to_servlet_list_map.put(site, this_site);
+                  this.servlet_to_site_map.put(url, site);
+                }
+            }
         
     }