Changeset 33112

Timestamp:

2019-05-27T21:07:15+12:00 (5 years ago)

Author:

ak19

Message:

Related to previous commit. Using StringBuffer for more optimal concatenation, since I can't remember whether it was Java or JavaScript that optimised String concatenation, or even whether at least one of them ever did so.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

@@ -896 +896 @@
 
     private String urlEncodeValue(String paramName, String paramVal) {
-        String oldParamVal = paramVal;
-        paramVal = "";
+        StringBuffer modParamVal = new StringBuffer();
         try{
             // don't do this, as it will double encode semicolons (and other such regular chars that will get URL encoded).
@@ -904 +903 @@
 
             // Instead, just encode chars whose int value is >= 128
-            for(int i = 0; i < oldParamVal.length(); i++) {
-            char c = oldParamVal.charAt(i);
+            for(int i = 0; i < paramVal.length(); i++) {
+            char c = paramVal.charAt(i);
             if(c >= 128) {
-                paramVal += URLEncoder.encode(""+c, "UTF-8");
+                modParamVal.append(URLEncoder.encode(""+c, "UTF-8"));
                 // Better way as per https://stackoverflow.com/questions/10786042/java-url-encoding-of-query-string-parameters
                 // but our release kits' Java is too old for importing java.nio.charset.StandardCharsets
                 //paramVal = URLEncoder.encode(""+c, StandardCharsets.UTF_8.name());        
             } else {
-                paramVal += c;
+                modParamVal.append(c);
             }
             }
-        
-            //logger.error("@@@@@@@@ old paramVal is: |" + oldParamVal + "|");
+
+            //logger.error("@@@@@@@@ old paramVal for paramName " + paramName + "is: |" + paramVal + "|");
+            paramVal = modParamVal.toString();
             //logger.error("@@@@@@@@ new param val for paramName " + paramName + " is: |" + paramVal + "|");
             
         } catch(UnsupportedEncodingException uee) {
             logger.warn("**** Unable to encode query_string param " + paramName + " in UTF-8, so attempting to continue with its unencoded value."); // don't output param value to log, in case of sensitive data?
-            paramVal = oldParamVal; 
-        }
+        }
+
         return paramVal;
     }