Changeset 24118

Timestamp:

2011-06-07T17:12:57+12:00 (12 years ago)

Author:

sjm84

Message:

Fixed a potential problem with the new hhf cgi parameter

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -566 +566 @@
         
         //Add custom HTTP headers if requested
-        Gson gson = new Gson();
-        Type type = new TypeToken<List<Map<String,String>>>() {}.getType();
-        List<Map<String,String>> httpHeaders = gson.fromJson(request.getParameter(GSParams.HTTPHEADERFIELDS), type);
-        if (httpHeaders != null && httpHeaders.size() > 0) {
-            
-            for(int j = 0; j < httpHeaders.size(); j++)
-            {
-                Map nameValueMap = (Map)httpHeaders.get(j);
-                String name = (String)nameValueMap.get("name");
-                String value = (String)nameValueMap.get("value");
+        String httpHeadersParam = request.getParameter(GSParams.HTTPHEADERFIELDS);
+        if (httpHeadersParam != null && httpHeadersParam.length() > 0)
+        {
+            Gson gson = new Gson();
+            Type type = new TypeToken<List<Map<String,String>>>() {}.getType();
+            List<Map<String,String>> httpHeaders = gson.fromJson(httpHeadersParam, type);
+            if (httpHeaders != null && httpHeaders.size() > 0) {
                 
-                if(name != null && value != null)
+                for(int j = 0; j < httpHeaders.size(); j++)
                 {
-                    response.setHeader(name, value);
+                    Map nameValueMap = (Map)httpHeaders.get(j);
+                    String name = (String)nameValueMap.get("name");
+                    String value = (String)nameValueMap.get("value");
+                    
+                    if(name != null && value != null)
+                    {
+                        response.setHeader(name, value);
+                    }
                 }
             }