summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/ServantManager.java
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2014-08-07 14:05:44 -0230
committerMatthew Newhook <matthew@zeroc.com>2014-08-07 14:05:44 -0230
commite3a672a438635a1173388aea9d7a2d44de358945 (patch)
tree57113ece1dd013c9687468a8dd7cc62c80136b86 /java/src/IceInternal/ServantManager.java
parentICE-5457 added ability to set source address for connections (diff)
downloadice-e3a672a438635a1173388aea9d7a2d44de358945.tar.bz2
ice-e3a672a438635a1173388aea9d7a2d44de358945.tar.xz
ice-e3a672a438635a1173388aea9d7a2d44de358945.zip
Add @Override where possible, and remove trailing white space.
Diffstat (limited to 'java/src/IceInternal/ServantManager.java')
-rw-r--r--java/src/IceInternal/ServantManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/IceInternal/ServantManager.java b/java/src/IceInternal/ServantManager.java
index 41cbb924698..0b188525d70 100644
--- a/java/src/IceInternal/ServantManager.java
+++ b/java/src/IceInternal/ServantManager.java
@@ -231,7 +231,7 @@ public final class ServantManager
{
Ice.ServantLocator l = null;
assert(_instance != null); // Must not be called after destruction.
-
+
l = _locatorMap.remove(category);
if(l == null)
{
@@ -280,7 +280,7 @@ public final class ServantManager
assert(_instance != null); // Must not be called after destruction.
logger = _instance.initializationData().logger;
_servantMapMap.clear();
-
+
locatorMap.putAll(_locatorMap);
_locatorMap.clear();
_instance = null;