Add source for jdk_1.4.2_14

fanhongtao · Aug 20, 2013 · 2a8723b · 2a8723b
1 parent 37a9017
commit 2a8723b
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 24 deletions.
diff --git a/COPYRIGHT b/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright 2006 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 
+Copyright 2007 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 
 California 95054, U.S.A. All rights reserved.
 
 Sun Microsystems, Inc. has intellectual property rights relating to
@@ -41,7 +41,7 @@ Federal Acquisitions: Commercial Software - Government Users Subject
 to Standard License Terms and Conditions.
 
 
-Copyright 2006 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 
+Copyright 2007 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 
 California 95054, �tats-Unis. Tous droits r�serv�s.
 
 Sun Microsystems, Inc. d�tient les droits de propri�t�

diff --git a/README b/README
@@ -261,5 +261,5 @@ Sun Java Web Pages
 The Java 2 SDK, Standard Edition, is a product of Sun Microsystems(TM), 
 Inc.  This product includes code licensed from RSA Security.
 
-Copyright 2006 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 
+Copyright 2007 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 
 California 95054, U.S.A.  All rights reserved.
diff --git a/src/com/sun/security/auth/module/Krb5LoginModule.java b/src/com/sun/security/auth/module/Krb5LoginModule.java
@@ -573,7 +573,12 @@ private void attemptAuthentication(boolean getPasswdFromSharedState)
 		// Get the TGT using AS Exchange
 		if (debug)
 		    System.out.println("principal is " + principal);
-		cred = Credentials.acquireTGT(principal, encKey);
+		cred = Credentials.acquireTGT(principal, encKey, 
+						new StringBuffer().append(password));
+
+		// update keys after pre-auth
+		encKey = new EncryptionKey(new StringBuffer().append(password),
+						principal.getSalt());
 
 		// we should hava a  non-null cred 
 		if (cred == null) {

diff --git a/src/java/beans/EventHandler.java b/src/java/beans/EventHandler.java
@@ -1,7 +1,7 @@
 /*
- * @(#)EventHandler.java	1.13 05/06/07
+ * @(#)EventHandler.java	1.15 07/01/12
  *
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
  * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
  */
 package java.beans; 
@@ -310,19 +310,16 @@ private Object applyGetters(Object target, String getters) {
 						   new Class[]{}); 
             } 
             if (getter == null) { 
-                System.err.println("No method called: " + first +
-				   " defined on " + target); 
-                return null; 
+                throw new RuntimeException("No method called: " + first +
+                                           " defined on " + target);
             } 
             Object newTarget = MethodUtil.invoke(getter, target, new Object[]{});
             return applyGetters(newTarget, rest); 
         } 
         catch (Throwable e) { 
-            System.out.println(e); 
-            System.err.println("Failed to call method: " + first +
-			       " on " + target); 
-        }
-        return null; 
+            throw new RuntimeException("Failed to call method: " + first +
+                                       " on " + target, e); 
+        } 
     }
 
     /**
@@ -380,18 +377,23 @@ private Object invokeInternal(Object proxy, Method method, Object[] arguments) {
                     targetMethod = ReflectionUtils.getMethod(target.getClass(),
                         "set" + NameGenerator.capitalize(action), argTypes);
                 }
-                if (targetMethod == null) { 
-                    System.err.println("No target method called: " + action +
-			" defined on class " + target.getClass() +
-			" with argument type " + argTypes[0]); 
+                if (targetMethod == null) {
+                    String argTypeString = (argTypes.length == 0)
+                                           ? " with no arguments"
+                                           : " with argument " + argTypes[0];
+                    throw new RuntimeException("No method called: " +
+                                               action +
+                                               " on " +
+                                               target.getClass() +
+                                               argTypeString);
                 }
                 return MethodUtil.invoke(targetMethod, target, newArgs);
             } 
             catch (IllegalAccessException ex) {
-                ex.printStackTrace();
+                throw new RuntimeException(ex);
             }
             catch (InvocationTargetException ex) {
-                ex.getTargetException().printStackTrace();
+                throw new RuntimeException(ex.getTargetException());
             }
         }
         return null;

diff --git a/src/java/nio/Buffer.java b/src/java/nio/Buffer.java
@@ -1,7 +1,7 @@
 /*
- * @(#)Buffer.java	1.29 03/01/23
+ * @(#)Buffer.java	1.31 07/01/12
  *
- * Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
  * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
  */
 
@@ -150,7 +150,7 @@
  *
  * @author Mark Reinhold
  * @author JSR-51 Expert Group
- * @version 1.29, 03/01/23
+ * @version 1.31, 07/01/12
  * @since 1.4
  */
 
@@ -175,7 +175,7 @@ public abstract class Buffer {
 	this.capacity = cap;
 	limit(lim);
 	position(pos);
-	if (mark > 0) {
+	if (mark >= 0) {
 	    if (mark > pos)
 		throw new IllegalArgumentException();
 	    this.mark = mark;