diff options
Diffstat (limited to 'java/src')
3 files changed, 13 insertions, 4 deletions
diff --git a/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionHelper.java b/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionHelper.java index 677d02af683..71c2c408827 100644 --- a/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionHelper.java +++ b/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/SessionHelper.java @@ -119,10 +119,9 @@ public class SessionHelper } /** - * Returns the Glacier2 session proxy. If the session hasn't been established yet, - * or the session has already been destroyed, throws SessionNotExistException. - * @return The session proxy, or throws SessionNotExistException if no session exists. - * @throws SessionNotExistException No session exists. + * Returns the Glacier2 session proxy, or null if the session hasn't been established yet + * or the session has already been destroyed. + * @return The session proxy, or null if no session exists. */ synchronized public SessionPrx session() { diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java b/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java index 52ce5cb6544..d40e2d43221 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java @@ -1043,6 +1043,8 @@ public class InputStream /** * Extracts a serializable Java object from the stream. * + * @param <T> The serializable type. + * @param cl The class for the serializable type. * @return The deserialized Java object. **/ public <T extends java.io.Serializable> T readSerializable(Class<T> cl) @@ -1086,7 +1088,9 @@ public class InputStream /** * Extracts a optional serializable Java object from the stream. * + * @param <T> The serializable type. * @param tag The numeric tag associated with the value. + * @param cl The class for the serializable type. * @return The optional value (if any). **/ public <T extends java.io.Serializable> java.util.Optional<T> readSerializable(int tag, Class<T> cl) @@ -1852,6 +1856,7 @@ public class InputStream /** * Extracts an optional proxy from the stream. The stream must have been initialized with a communicator. * + * @param <T> The proxy type. * @param tag The numeric tag associated with the value. * @param cast The uncheckedCast function to call on the unmarshaled proxy to obtain the correct proxy type. * @return The optional value (if any). @@ -1901,6 +1906,8 @@ public class InputStream /** * Extracts a Slice value from the stream. * + * @param <T> The value type. + * * @param cb The consumer to notify when the extracted instance is available. The stream * extracts Slice values in stages. The Ice run time calls accept on the consumer when * the corresponding instance has been fully unmarshaled. @@ -1944,6 +1951,8 @@ public class InputStream /** * Extracts an optional Slice value from the stream. * + * @param <T> The value type. + * * @param tag The numeric tag associated with the value. * * @param cb The consumer to notify when the extracted instance is available. The stream diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/OutputStream.java b/java/src/Ice/src/main/java/com/zeroc/Ice/OutputStream.java index 384077d9a03..f0f5f6285ee 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/OutputStream.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/OutputStream.java @@ -740,6 +740,7 @@ public class OutputStream /** * Writes an optional serializable Java object to the stream. * + * @param <T> The serializable class. * @param tag The optional tag. * @param v The optional serializable object to write. **/ |