summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/ObjectAdapterFactory.java
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2002-07-30 18:51:27 +0000
committerMarc Laukien <marc@zeroc.com>2002-07-30 18:51:27 +0000
commit3414f16fd4d530f6faf167b7f98434bee805a073 (patch)
treec8b6e9744ba53a84c82f94c305cb967cdf298809 /java/src/IceInternal/ObjectAdapterFactory.java
parentRemoved IceBox.ServiceManager property. (diff)
downloadice-3414f16fd4d530f6faf167b7f98434bee805a073.tar.bz2
ice-3414f16fd4d530f6faf167b7f98434bee805a073.tar.xz
ice-3414f16fd4d530f6faf167b7f98434bee805a073.zip
fixed mutex bug
Diffstat (limited to 'java/src/IceInternal/ObjectAdapterFactory.java')
-rw-r--r--java/src/IceInternal/ObjectAdapterFactory.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/IceInternal/ObjectAdapterFactory.java
index 975a262ac09..80b295fa7ea 100644
--- a/java/src/IceInternal/ObjectAdapterFactory.java
+++ b/java/src/IceInternal/ObjectAdapterFactory.java
@@ -21,6 +21,7 @@ public final class ObjectAdapterFactory
Ice.ObjectAdapter adapter = (Ice.ObjectAdapter)i.next();
adapter.deactivate();
}
+
_adapters.clear();
}
@@ -38,7 +39,7 @@ public final class ObjectAdapterFactory
return adapter;
}
- public Ice.ObjectAdapter
+ public synchronized Ice.ObjectAdapter
findObjectAdapter(Ice.ObjectPrx proxy)
{
java.util.Iterator i = _adapters.values().iterator();