8061826: Part of JDK-8060474 should be reverted
authorweijun
Thu, 23 Oct 2014 07:07:16 +0800
changeset 28554 5eda7a0f3ea3
parent 28553 6c0b398bd744
child 28555 c7bf34f7b215
8061826: Part of JDK-8060474 should be reverted Reviewed-by: mullan, ahgross
jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java
jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java
--- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java	Tue Oct 21 22:37:17 2014 +0800
+++ b/jdk/src/java.security.jgss/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/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java	Tue Oct 21 22:37:17 2014 +0800
+++ b/jdk/src/java.security.jgss/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) {