diff options
author | Mark Spruiell <mes@zeroc.com> | 2014-08-15 16:23:00 -0700 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2014-08-15 16:23:00 -0700 |
commit | 01f1626babbe190f2d317b56a2a69eb164a00710 (patch) | |
tree | 02ab5fa55dc9f30984a618a76db64b053f8ce88a /java/src | |
parent | ICE-5592 - IceSSL.FindCert (SChannel Windows C++ impl) (diff) | |
download | ice-01f1626babbe190f2d317b56a2a69eb164a00710.tar.bz2 ice-01f1626babbe190f2d317b56a2a69eb164a00710.tar.xz ice-01f1626babbe190f2d317b56a2a69eb164a00710.zip |
minor Java edits
Diffstat (limited to 'java/src')
-rw-r--r-- | java/src/Ice/ConnectionI.java | 2 | ||||
-rw-r--r-- | java/src/Ice/ObjectAdapterI.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/java/src/Ice/ConnectionI.java b/java/src/Ice/ConnectionI.java index c835e398735..b304efa82b5 100644 --- a/java/src/Ice/ConnectionI.java +++ b/java/src/Ice/ConnectionI.java @@ -3076,7 +3076,7 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne // // This is similar to a mutex lock in that the flag is // only true for a short time period. As such we don't permit the - // wait to be interrupted. Instead the interrupted status is saved\ + // wait to be interrupted. Instead the interrupted status is saved // and restored. // boolean interrupted = false; diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java index c3ab836967c..82841fdf67c 100644 --- a/java/src/Ice/ObjectAdapterI.java +++ b/java/src/Ice/ObjectAdapterI.java @@ -1640,11 +1640,12 @@ public final class ObjectAdapterI implements ObjectAdapter return noProps; } - private enum DeactivatedState { + private enum DeactivatedState + { Steady, Deactivating, Deactivated - }; + } private DeactivatedState _deactivated; private IceInternal.Instance _instance; private Communicator _communicator; |