diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-08-22 15:35:21 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-08-22 15:35:21 -0230 |
| commit | 609591644a83b2c75627951a89d6caa2cce2e3eb (patch) | |
| tree | da2e8632b79fdf3a2b1c76d29c5feea716d93dee /java/src/IceInternal/ServantManager.java | |
| parent | Sort src Makefiles for C# and Python (diff) | |
| download | ice-609591644a83b2c75627951a89d6caa2cce2e3eb.tar.bz2 ice-609591644a83b2c75627951a89d6caa2cce2e3eb.tar.xz ice-609591644a83b2c75627951a89d6caa2cce2e3eb.zip | |
ICE-5606 renamed ServantLocator::deactivate to destroy
Diffstat (limited to 'java/src/IceInternal/ServantManager.java')
| -rw-r--r-- | java/src/IceInternal/ServantManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/IceInternal/ServantManager.java b/java/src/IceInternal/ServantManager.java index 0b188525d70..d3c34b761b4 100644 --- a/java/src/IceInternal/ServantManager.java +++ b/java/src/IceInternal/ServantManager.java @@ -291,11 +291,11 @@ public final class ServantManager Ice.ServantLocator locator = p.getValue(); try { - locator.deactivate(p.getKey()); + locator.destroy(p.getKey()); } catch(java.lang.Exception ex) { - String s = "exception during locator deactivation:\n" + "object adapter: `" + _adapterName + "'\n" + + String s = "exception during locator destruction:\n" + "object adapter: `" + _adapterName + "'\n" + "locator category: `" + p.getKey() + "'\n" + Ex.toString(ex); logger.error(s); } |