summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/ObjectInputStream.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/ObjectInputStream.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/ObjectInputStream.java')
-rw-r--r--java/src/IceInternal/ObjectInputStream.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/java/src/IceInternal/ObjectInputStream.java b/java/src/IceInternal/ObjectInputStream.java
index d75d7804630..d8c619f5281 100644
--- a/java/src/IceInternal/ObjectInputStream.java
+++ b/java/src/IceInternal/ObjectInputStream.java
@@ -25,6 +25,7 @@ public class ObjectInputStream extends java.io.ObjectInputStream
_instance = instance;
}
+ @Override
protected Class<?>
resolveClass(java.io.ObjectStreamClass cls)
throws java.io.IOException, ClassNotFoundException