--- old/src/share/classes/java/util/Collections.java	2012-03-01 11:26:16.000000000 -0800
+++ new/src/share/classes/java/util/Collections.java	2012-03-01 11:26:15.000000000 -0800
@@ -152,6 +152,9 @@
      */
     public static <T extends Comparable<? super T>> void sort(List<T> list) {
         Object[] a = list.toArray();
+        if(a.length <= 1) {
+            return;
+        }
         Arrays.sort(a);
         ListIterator<T> i = list.listIterator();
         for (int j=0; j<a.length; j++) {
@@ -214,11 +217,14 @@
      */
     public static <T> void sort(List<T> list, Comparator<? super T> c) {
         Object[] a = list.toArray();
+        if(a.length <= 1) {
+            return;
+        }
         Arrays.sort(a, (Comparator)c);
-        ListIterator i = list.listIterator();
+        ListIterator<T> i = list.listIterator();
         for (int j=0; j<a.length; j++) {
             i.next();
-            i.set(a[j]);
+            i.set((T) a[j]);
         }
     }
 
--- old/test/java/util/Collections/Swap.java	2012-03-01 11:26:17.000000000 -0800
+++ /dev/null	2012-03-01 11:26:17.000000000 -0800
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug     4323074
- * @summary Basic test for newly public swap algorithm
- * @author  Josh Bloch
- */
-
-import java.util.*;
-
-public class Swap {
-    static final int SIZE = 100;
-
-    public static void main(String[] args) throws Exception {
-        List l = new ArrayList(Collections.nCopies(100, Boolean.FALSE));
-        l.set(0, Boolean.TRUE);
-        for (int i=0; i < SIZE-1; i++)
-            Collections.swap(l, i, i+1);
-
-        List l2 = new ArrayList(Collections.nCopies(100, Boolean.FALSE));
-        l2.set(SIZE-1, Boolean.TRUE);
-        if (!l.equals(l2))
-            throw new RuntimeException("Wrong result");
-    }
-}
--- /dev/null	2012-03-01 11:26:17.000000000 -0800
+++ new/test/java/util/Collections/SortEmptyAndSingleton.java	2012-03-01 11:26:16.000000000 -0800
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug     7065380
+ * @summary Tests sorting of emptyList and singletonList.
+ * @author  Mike Duigou
+ */
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+public class SortEmptyAndSingleton {    
+    static final java.util.Comparator<Integer> COMPARATOR =  new Comparator<Integer>() {
+            public int compare(Integer one, Integer two) {
+                return one - two;
+            }
+        };
+    
+    public static void main(String[] args) throws Exception {
+        List<Integer> empty = Collections.<Integer>emptyList();
+        Collections.sort(empty);               
+        Collections.sort(empty,COMPARATOR);
+        
+        // 7065380
+        List<Integer> single = Collections.<Integer>singletonList(0);
+        Collections.sort(single);
+        Collections.sort(single,COMPARATOR);
+    }
+}