diff options
author | Benoit Foucher <benoit@zeroc.com> | 2016-09-26 15:12:58 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2016-09-26 15:12:58 +0200 |
commit | 2086b1409faff021f3dea442e00607ed0ee93280 (patch) | |
tree | bd0ee219c2f6553751cda81b96c25bade21ab7c6 /java | |
parent | Fix for ICE-7377 - IceStorm/streess test hang (diff) | |
download | ice-2086b1409faff021f3dea442e00607ed0ee93280.tar.bz2 ice-2086b1409faff021f3dea442e00607ed0ee93280.tar.xz ice-2086b1409faff021f3dea442e00607ed0ee93280.zip |
Minor javadoc fixes
Diffstat (limited to 'java')
3 files changed, 10 insertions, 10 deletions
diff --git a/java/src/Glacier2/src/main/java/Glacier2/Application.java b/java/src/Glacier2/src/main/java/Glacier2/Application.java index 90ab0ace0bf..46a0b074b48 100644 --- a/java/src/Glacier2/src/main/java/Glacier2/Application.java +++ b/java/src/Glacier2/src/main/java/Glacier2/Application.java @@ -53,7 +53,7 @@ public abstract class Application extends Ice.Application } /** - * Initializes an instance that calls {@link Communicator#shutdown} if + * Initializes an instance that calls {@link Ice.Communicator#shutdown} if * a signal is received. **/ public @@ -67,7 +67,7 @@ public abstract class Application extends Ice.Application * * @param signalPolicy Determines how to respond to signals. * - * @see SignalPolicy + * @see Ice.SignalPolicy **/ public Application(Ice.SignalPolicy signalPolicy) diff --git a/java/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java b/java/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java index b7b086a8798..8653443befc 100644 --- a/java/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java +++ b/java/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java @@ -162,7 +162,7 @@ public class SessionFactoryHelper { return getProtocol().equals("ssl"); } - + /** * * Sets the protocol that will be used by the session factory to establish the connection. @@ -175,7 +175,7 @@ public class SessionFactoryHelper { throw new IllegalArgumentException("You must use a valid protocol"); } - + if(!protocol.equals("tcp") && !protocol.equals("ssl") && !protocol.equals("wss") && @@ -183,7 +183,7 @@ public class SessionFactoryHelper { throw new IllegalArgumentException("Unknow protocol `" + protocol + "'"); } - + _protocol = protocol; } @@ -242,10 +242,10 @@ public class SessionFactoryHelper { return getPortInternal(); } - + private int getPortInternal() { - return _port == 0 ? ((_protocol.equals("ssl") || + return _port == 0 ? ((_protocol.equals("ssl") || _protocol.equals("wss"))? GLACIER2_SSL_PORT : GLACIER2_TCP_PORT) : _port; } @@ -315,7 +315,7 @@ public class SessionFactoryHelper * Connect the Glacier2 session using user name and password credentials. * * Once the connection is established, {@link SessionCallback#connected} is called on the callback object; - * upon failure, {@link SessionCallback#connectFailed) is called with the exception. + * upon failure, {@link SessionCallback#connectFailed} is called with the exception. * * @param username The user name. * @param password The password. diff --git a/java/src/Glacier2/src/main/java/Glacier2/SessionHelper.java b/java/src/Glacier2/src/main/java/Glacier2/SessionHelper.java index 2d86ba44bc0..e84bbf565ca 100644 --- a/java/src/Glacier2/src/main/java/Glacier2/SessionHelper.java +++ b/java/src/Glacier2/src/main/java/Glacier2/SessionHelper.java @@ -211,7 +211,7 @@ public class SessionHelper * Connects to the Glacier2 router using the associated SSL credentials. * * Once the connection is established, {@link SessionCallback#connected} is called on the callback object; - * upon failure, {@link SessionCallback#exception} is called with the exception. + * upon failure, {@link SessionCallback#connectFailed} is called with the exception. * * @param context The request context to use when creating the session. */ @@ -233,7 +233,7 @@ public class SessionHelper * Connects a Glacier2 session using user name and password credentials. * * Once the connection is established, {@link SessionCallback#connected} is called on the callback object; - * upon failure {@link SessionCallback.exception} is called with the exception. + * upon failure {@link SessionCallback.connectFailed} is called with the exception. * * @param username The user name. * @param password The password. |