diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cz/crcs/ectester/common/util/Util.java | 10 | ||||
| -rw-r--r-- | src/cz/crcs/ectester/data/EC_Store.java | 11 |
2 files changed, 20 insertions, 1 deletions
diff --git a/src/cz/crcs/ectester/common/util/Util.java b/src/cz/crcs/ectester/common/util/Util.java index 3a4912a..5b0cd79 100644 --- a/src/cz/crcs/ectester/common/util/Util.java +++ b/src/cz/crcs/ectester/common/util/Util.java @@ -15,4 +15,14 @@ public class Util { return nanos / 1000000; } } + + public static int getVersion() { + String version = System.getProperty("java.version"); + if(version.startsWith("1.")) { + version = version.substring(2, 3); + } else { + int dot = version.indexOf("."); + if(dot != -1) { version = version.substring(0, dot); } + } return Integer.parseInt(version); + } } diff --git a/src/cz/crcs/ectester/data/EC_Store.java b/src/cz/crcs/ectester/data/EC_Store.java index d104fa4..bcadf80 100644 --- a/src/cz/crcs/ectester/data/EC_Store.java +++ b/src/cz/crcs/ectester/data/EC_Store.java @@ -1,6 +1,7 @@ package cz.crcs.ectester.data; import cz.crcs.ectester.common.ec.*; +import cz.crcs.ectester.common.util.Util; import javacard.security.KeyPair; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -71,7 +72,15 @@ public class EC_Store { public InputSource resolveEntity(String name, String publicId, String baseURI, String systemId) throws SAXException, IOException { InputSource is = new InputSource(); is.setSystemId(systemId); - is.setByteStream(getClass().getClass().getResourceAsStream("/cz/crcs/ectester/data/" + systemId)); + + InputStream bs; + // TODO: Figure out if this is correct for the older Java versions or also wrong. + if (Util.getVersion() <= 8) { + bs = getClass().getClass().getResourceAsStream("/cz/crcs/ectester/data/" + systemId); + } else { + bs = getClass().getResourceAsStream("/cz/crcs/ectester/data/" + systemId); + } + is.setByteStream(bs); return is; } |