summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/Incoming.java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2013-01-18 16:05:32 +0100
committerBenoit Foucher <benoit@zeroc.com>2013-01-18 16:05:32 +0100
commitc9fcc690d90fd294145b8e3eab876b2e92edf237 (patch)
treef178ad28a951a0080f088aa96c80ffb5628b8e42 /java/src/IceInternal/Incoming.java
parentFixed IceGrid compilation with G++ 4.6 (diff)
downloadice-c9fcc690d90fd294145b8e3eab876b2e92edf237.tar.bz2
ice-c9fcc690d90fd294145b8e3eab876b2e92edf237.tar.xz
ice-c9fcc690d90fd294145b8e3eab876b2e92edf237.zip
Changed Ice.UseServantClassLoader to Ice.UseApplicationClassLoader
Diffstat (limited to 'java/src/IceInternal/Incoming.java')
-rw-r--r--java/src/IceInternal/Incoming.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/IceInternal/Incoming.java b/java/src/IceInternal/Incoming.java
index 1bb01d0ef68..f9c194b89f8 100644
--- a/java/src/IceInternal/Incoming.java
+++ b/java/src/IceInternal/Incoming.java
@@ -208,7 +208,7 @@ final public class Incoming extends IncomingBase implements Ice.Request
{
if(_servant != null)
{
- if(_instance.useServantClassLoader())
+ if(_instance.useApplicationClassLoader())
{
Thread.currentThread().setContextClassLoader(_servant.getClass().getClassLoader());
}
@@ -229,7 +229,7 @@ final public class Incoming extends IncomingBase implements Ice.Request
}
finally
{
- if(_instance.useServantClassLoader())
+ if(_instance.useApplicationClassLoader())
{
Thread.currentThread().setContextClassLoader(null);
}