diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-01-18 07:05:45 -0800 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-01-18 07:05:45 -0800 |
| commit | a135edb5f44ef42c9238ef4d58169485fd03060f (patch) | |
| tree | 77251b156f71d2af2f5f6f17c56634c812b52112 /java/src/IceInternal/Instance.java | |
| parent | Improved EJB demo to test user exceptions (diff) | |
| parent | Changed Ice.UseServantClassLoader to Ice.UseApplicationClassLoader (diff) | |
| download | ice-a135edb5f44ef42c9238ef4d58169485fd03060f.tar.bz2 ice-a135edb5f44ef42c9238ef4d58169485fd03060f.tar.xz ice-a135edb5f44ef42c9238ef4d58169485fd03060f.zip | |
Merge branch 'master' of ssh://dev.vpn.zeroc.com/home/git/ice
Diffstat (limited to 'java/src/IceInternal/Instance.java')
| -rw-r--r-- | java/src/IceInternal/Instance.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java index 3f21329b6d9..c21c40337b0 100644 --- a/java/src/IceInternal/Instance.java +++ b/java/src/IceInternal/Instance.java @@ -616,9 +616,9 @@ public final class Instance } public boolean - useServantClassLoader() + useApplicationClassLoader() { - return _useServantClassLoader; + return _useApplicationClassLoader; } // @@ -717,7 +717,7 @@ public final class Instance _packages = validatePackages(); - _useServantClassLoader = _initData.properties.getPropertyAsInt("Ice.UseServantClassLoader") > 0; + _useApplicationClassLoader = _initData.properties.getPropertyAsInt("Ice.UseApplicationClassLoader") > 0; _traceLevels = new TraceLevels(_initData.properties); @@ -1218,7 +1218,7 @@ public final class Instance private java.util.Map<String, String> _typeToClassMap = new java.util.HashMap<String, String>(); final private String[] _packages; - final private boolean _useServantClassLoader; + final private boolean _useApplicationClassLoader; private static boolean _oneOffDone = false; } |