summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/CHANGES4
1 files changed, 4 insertions, 0 deletions
diff --git a/java/CHANGES b/java/CHANGES
index 5ef9c60c4fb..a98e82ef0d4 100644
--- a/java/CHANGES
+++ b/java/CHANGES
@@ -50,6 +50,10 @@ Changes since version 3.2.X (binary incompatible)
Changes since version 3.2.0
---------------------------
+- Fixed object adapter activation deadlock. The deadlock could occur
+ when the adapter register its endpoints with the locator registry
+ and if another thread invokes concurrently on the locator.
+
- Fixed a bug in IceSSL that could cause a NullPointerException when
using TrustOnly properties.