summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/Incoming.java
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2005-09-15 13:56:03 +0000
committerMichi Henning <michi@zeroc.com>2005-09-15 13:56:03 +0000
commit71e29f14fd7398f0bca0e3a4bf3ea6391214709f (patch)
tree311679d37fb54f6c7115a1ce17b648b48accac3d /java/src/IceInternal/Incoming.java
parentFix to fix for bug 368 (diff)
downloadice-71e29f14fd7398f0bca0e3a4bf3ea6391214709f.tar.bz2
ice-71e29f14fd7398f0bca0e3a4bf3ea6391214709f.tar.xz
ice-71e29f14fd7398f0bca0e3a4bf3ea6391214709f.zip
Fix to fix for bug 368.
Diffstat (limited to 'java/src/IceInternal/Incoming.java')
-rw-r--r--java/src/IceInternal/Incoming.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/java/src/IceInternal/Incoming.java b/java/src/IceInternal/Incoming.java
index 11c433f53d0..59954012806 100644
--- a/java/src/IceInternal/Incoming.java
+++ b/java/src/IceInternal/Incoming.java
@@ -111,6 +111,18 @@ final public class Incoming extends IncomingBase
if(_servant == null)
{
_locator = servantManager.findServantLocator(_current.id.category);
+ if(_locator == null && _current.id.category.length() > 0)
+ {
+ _locator = servantManager.findServantLocator("");
+ }
+ if(_locator != null)
+ {
+ _servant = _locator.locate(_current, _cookie);
+ }
+ }
+ if(_servant == null)
+ {
+ _locator = servantManager.findServantLocator("");
if(_locator != null)
{
_servant = _locator.locate(_current, _cookie);