From 5315caf83087c39531daaaa8760eddbb78404cb1 Mon Sep 17 00:00:00 2001 From: Ashish Chopra Date: Mon, 30 Mar 2020 10:38:52 +0530 Subject: [PATCH] #526 Fixed unnecessary 'overenginnering' in previous commit :facepalm: --- .../imageio/plugins/svg/SVGReadParam.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGReadParam.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGReadParam.java index 78bbba71..0f7779ca 100755 --- a/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGReadParam.java +++ b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGReadParam.java @@ -41,8 +41,8 @@ import java.awt.*; public class SVGReadParam extends ImageReadParam { private Paint background; private String baseURI; - private boolean allowExternalResources = false; - private boolean isAllowExternalResourcesSetExplicitly = false; + private boolean allowExternalResources = + "true".equals(System.getProperty(SVGImageReader.ALLOW_EXTERNAL_RESOURCES_SYSTEM_PROP)); public SVGReadParam() { super(); @@ -66,16 +66,10 @@ public class SVGReadParam extends ImageReadParam { public void setAllowExternalResources(boolean allow) { allowExternalResources = allow; - isAllowExternalResourcesSetExplicitly = true; } public boolean isAllowExternalResources() { - if (isAllowExternalResourcesSetExplicitly) { - return allowExternalResources; - } else { - // prefer the explicitly set value if invoked, read the system prop as a fallback if it wasn't - return "true".equals(System.getProperty(SVGImageReader.ALLOW_EXTERNAL_RESOURCES_SYSTEM_PROP)); - } + return allowExternalResources; } @Override