OWS-631: only block http agent property and not all properties from the JNLP file

Author: sclassen

core/src/main/java/net/sourceforge/jnlp/JNLPFile.java

@@ -261,7 +261,7 @@ protected JNLPFile() {
 
         final String httpAgent = getResources().getPropertiesMap().get(HTTP_AGENT);
         // Do not set http.agent in stage 2 as it can be set from  the vmarg to the jvm
-        if (! StringUtils.isBlank(httpAgent) && !"true".equalsIgnoreCase(System.getenv(ApplicationInstance.IGNORE_JNLP_RESOURCE_PROPERTIES))) {
+        if (! StringUtils.isBlank(httpAgent) && !"true".equalsIgnoreCase(System.getenv(ApplicationInstance.IGNORE_HTTP_AGENT_PROPERTY))) {
             System.setProperty(HTTP_AGENT, httpAgent);
             if (!HttpURLConnection.userAgent.contains(httpAgent)) {
                 LOG.warn("Cannot set HTTP User-Agent as a connection has been opened before reading the JNLP file");

core/src/main/java/net/sourceforge/jnlp/runtime/ApplicationInstance.java

@@ -54,7 +54,7 @@ public class ApplicationInstance {
 
     private static final String DEPLOYMENT_SYSPROP = "deployment.javaws";
     private static final String DEPLOYMENT_SYSPROP_VALUE = "IcedTea-Web";
-    public static final String IGNORE_JNLP_RESOURCE_PROPERTIES = "ignoreJnlpResourceProperties";
+    public static final String IGNORE_HTTP_AGENT_PROPERTY = "ignoreHttpAgentProperty";
 
     // todo: should attempt to unload the environment variables
     // installed by the application.
@@ -158,7 +158,7 @@ private void setSystemPropertiesFromJnlp() {
                 for (PropertyDesc propDesc : props) {
                     if (!propDesc.getKey().equals(JavaSystemPropertiesConstants.HTTP_AGENT)) {
                         setSystemProperty(propDesc);
-                    } else if (!"true".equalsIgnoreCase(System.getenv(ApplicationInstance.IGNORE_JNLP_RESOURCE_PROPERTIES))) {
+                    } else if (!"true".equalsIgnoreCase(System.getenv(ApplicationInstance.IGNORE_HTTP_AGENT_PROPERTY))) {
                         setSystemProperty(propDesc);
                     }
                 }