diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-08-22 16:28:31 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-08-22 16:28:31 -0230 |
| commit | 8e63757aa8c07d290856fd987ae78d90ffd2ae16 (patch) | |
| tree | dfa0189f62bc8373c57604bdb6875fcd825f29a9 /java/src/IceInternal/ServantManager.java | |
| parent | ICE-5606 renamed ServantLocator::deactivate to destroy (diff) | |
| download | ice-8e63757aa8c07d290856fd987ae78d90ffd2ae16.tar.bz2 ice-8e63757aa8c07d290856fd987ae78d90ffd2ae16.tar.xz ice-8e63757aa8c07d290856fd987ae78d90ffd2ae16.zip | |
Revert "ICE-5606 renamed ServantLocator::deactivate to destroy"
This reverts commit 710af6e9ea945157ef8b92112167aeda01b6d383.
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 d3c34b761b4..0b188525d70 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.destroy(p.getKey()); + locator.deactivate(p.getKey()); } catch(java.lang.Exception ex) { - String s = "exception during locator destruction:\n" + "object adapter: `" + _adapterName + "'\n" + + String s = "exception during locator deactivation:\n" + "object adapter: `" + _adapterName + "'\n" + "locator category: `" + p.getKey() + "'\n" + Ex.toString(ex); logger.error(s); } |