From 409a82263a1173fd773b2014f5900509c6de1ae6 Mon Sep 17 00:00:00 2001 From: weijun Date: Thu, 23 Oct 2014 07:07:16 +0800 Subject: [PATCH] 8061826: Part of JDK-8060474 should be reverted Reviewed-by: mullan, ahgross --- .../sun/security/krb5/internal/ktab/KeyTabInputStream.java | 2 +- .../sun/security/krb5/internal/util/KrbDataInputStream.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java b/src/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java index 78214b2ee..9584131ed 100644 --- a/src/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java +++ b/src/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java @@ -58,7 +58,7 @@ public class KeyTabInputStream extends KrbDataInputStream implements KeyTabConst * Reads the number of bytes this entry data occupy. */ int readEntryLength() throws IOException { - return readLength4(); + return read(4); } diff --git a/src/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java b/src/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java index 2cd5adc9b..d7a531bed 100644 --- a/src/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java +++ b/src/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java @@ -82,7 +82,7 @@ public class KrbDataInputStream extends BufferedInputStream{ byte[] bytes = new byte[num]; if (read(bytes, 0, num) != num) { throw new IOException("Premature end of stream reached"); - }; + } int result = 0; for (int i = 0; i < num; i++) { if (bigEndian) { -- GitLab