summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2020-12-30 21:12:18 +0100
committerJose <jose@zeroc.com>2020-12-30 21:12:18 +0100
commitc1bf4f414e099a42086cd4ea64dec7072b02b268 (patch)
treef50525fd18d2c31dcd97ab02d3aabd2c20603cf6
parentReplace SHA1/MD5 fingerprint with sha256 fingerprint (diff)
downloadice-c1bf4f414e099a42086cd4ea64dec7072b02b268.tar.bz2
ice-c1bf4f414e099a42086cd4ea64dec7072b02b268.tar.xz
ice-c1bf4f414e099a42086cd4ea64dec7072b02b268.zip
Use short cast to make narrow conversion in compound assignment explicit
-rw-r--r--java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java2
-rw-r--r--java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Options.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java b/java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java
index e2ba6156e26..3b3f814eae2 100644
--- a/java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java
+++ b/java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java
@@ -285,7 +285,7 @@ public final class Options
j < i + 3 && j < line.length() && hexDigits.indexOf(c = line.charAt(j)) != -1;
++j)
{
- s *= 16;
+ s *= (short)16;
if(Character.isDigit(c))
{
s += (short)(c - '0');
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Options.java b/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Options.java
index 89900faa6af..9fd7a381fdf 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Options.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Options.java
@@ -287,7 +287,7 @@ public final class Options
j < i + 3 && j < line.length() && hexDigits.indexOf(c = line.charAt(j)) != -1;
++j)
{
- s *= 16;
+ s *= (short)16;
if(Character.isDigit(c))
{
s += (short)(c - '0');