From 5fe2a337c1e5f5a2e7f580dcb42b53b057aa0087 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Thu, 1 Feb 2007 19:23:35 +0000 Subject: [PATCH] This needs to be done in a sandbox safe manner. git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@135 ed5b42cb-e716-0410-a449-f6a68f950b19 --- src/java/com/threerings/resource/ResourceManager.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/java/com/threerings/resource/ResourceManager.java b/src/java/com/threerings/resource/ResourceManager.java index 795a426f..6dd5d0d4 100644 --- a/src/java/com/threerings/resource/ResourceManager.java +++ b/src/java/com/threerings/resource/ResourceManager.java @@ -164,6 +164,13 @@ public class ResourceManager _rootPath = resourceRoot; _loader = loader; + // check a system property to determine if we should unpack our bundles, but don't freak + // out if we fail to read it + try { + _unpack = Boolean.getBoolean("no_unpack_resources"); + } catch (SecurityException se) { + } + // get our resource directory from resource_dir if possible initResourceDir(null); } @@ -638,6 +645,7 @@ public class ResourceManager try { resourceDir = System.getProperty("resource_dir"); } catch (SecurityException se) { + // no problem } } @@ -737,7 +745,7 @@ public class ResourceManager protected String _rootPath; /** Whether or not to unpack our resource bundles. */ - protected boolean _unpack = Boolean.getBoolean("no_unpack_resources"); + protected boolean _unpack; /** Our default resource set. */ protected ResourceBundle[] _default = new ResourceBundle[0];