changeset 10439:b6aeaae6dd9d jdk8u31-b06

8061826: Part of JDK-8060474 should be reverted Reviewed-by: mullan, ahgross
author weijun
date Thu, 23 Oct 2014 07:07:16 +0800
parents 0d88cc2527c8
children 34a484abc5d5
files src/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java src/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java	Thu Oct 16 11:09:56 2014 +0800
+++ b/src/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java	Thu Oct 23 07:07:16 2014 +0800
@@ -58,7 +58,7 @@
      * Reads the number of bytes this entry data occupy.
      */
     int readEntryLength() throws IOException {
-        return readLength4();
+        return read(4);
     }
 
 
--- a/src/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java	Thu Oct 16 11:09:56 2014 +0800
+++ b/src/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java	Thu Oct 23 07:07:16 2014 +0800
@@ -82,7 +82,7 @@
         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) {