diff options
| author | Mark Spruiell <mes@zeroc.com> | 2017-02-09 16:31:31 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2017-02-09 16:31:31 -0800 |
| commit | af409fe78bdca7db6315ab0cc99ad063f8daecf7 (patch) | |
| tree | b0079f556247a14f43e77ca6a31cb42df019485b /java/src | |
| parent | Fixed enum-related warnings (diff) | |
| download | ice-af409fe78bdca7db6315ab0cc99ad063f8daecf7.tar.bz2 ice-af409fe78bdca7db6315ab0cc99ad063f8daecf7.tar.xz ice-af409fe78bdca7db6315ab0cc99ad063f8daecf7.zip | |
ICE-7560 - more AMI test fixes, renaming ConnectionClose enumerators
Diffstat (limited to 'java/src')
3 files changed, 5 insertions, 5 deletions
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java index 4634a5ca4ec..3fee8354bb9 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java @@ -172,17 +172,17 @@ public final class ConnectionI extends com.zeroc.IceInternal.EventHandler throw new OperationInterruptedException(); } - if(mode == ConnectionClose.CloseForcefully) + if(mode == ConnectionClose.Forcefully) { setState(StateClosed, new ConnectionManuallyClosedException(false)); } - else if(mode == ConnectionClose.CloseGracefully) + else if(mode == ConnectionClose.Gracefully) { setState(StateClosing, new ConnectionManuallyClosedException(true)); } else { - assert(mode == ConnectionClose.CloseGracefullyAndWait); + assert(mode == ConnectionClose.GracefullyWithWait); // // Wait until all outstanding requests have been completed. diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/IncomingConnectionFactory.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/IncomingConnectionFactory.java index 2aacbaebdc3..583144199a3 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/IncomingConnectionFactory.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/IncomingConnectionFactory.java @@ -137,7 +137,7 @@ public final class IncomingConnectionFactory extends EventHandler implements Con // for(ConnectionI c : connections) { - c.close(com.zeroc.Ice.ConnectionClose.CloseForcefully); + c.close(com.zeroc.Ice.ConnectionClose.Forcefully); } throw e; } diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingConnectionFactory.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingConnectionFactory.java index 99f29b8cbd1..853daa920a1 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingConnectionFactory.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingConnectionFactory.java @@ -138,7 +138,7 @@ public final class OutgoingConnectionFactory { for(ConnectionI c : l) { - c.close(com.zeroc.Ice.ConnectionClose.CloseForcefully); + c.close(com.zeroc.Ice.ConnectionClose.Forcefully); } } throw new com.zeroc.Ice.OperationInterruptedException(); |