summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/ObjectAdapterFactory.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/ObjectAdapterFactory.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/ObjectAdapterFactory.java')
-rw-r--r--java/src/IceInternal/ObjectAdapterFactory.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/IceInternal/ObjectAdapterFactory.java
index e8d01a647b5..308be141f5b 100644
--- a/java/src/IceInternal/ObjectAdapterFactory.java
+++ b/java/src/IceInternal/ObjectAdapterFactory.java
@@ -30,7 +30,7 @@ public final class ObjectAdapterFactory
_communicator = null;
adapters = new java.util.LinkedList<Ice.ObjectAdapterI>(_adapters);
-
+
notifyAll();
}
@@ -66,7 +66,7 @@ public final class ObjectAdapterFactory
adapters = new java.util.LinkedList<Ice.ObjectAdapterI>(_adapters);
}
-
+
//
// Now we wait for deactivation of each object adapter.
//
@@ -106,7 +106,7 @@ public final class ObjectAdapterFactory
_adapters.clear();
}
}
-
+
public void
updateConnectionObservers()
{
@@ -232,6 +232,7 @@ public final class ObjectAdapterFactory
_communicator = communicator;
}
+ @Override
protected synchronized void
finalize()
throws Throwable