ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/JSR166TestCase.java
(Generate patch)

Comparing jsr166/src/test/tck/JSR166TestCase.java (file contents):
Revision 1.72 by jsr166, Sun Nov 28 08:43:53 2010 UTC vs.
Revision 1.98 by jsr166, Sun Feb 3 06:20:32 2013 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
8  
9   import junit.framework.*;
10 + import java.io.ByteArrayInputStream;
11 + import java.io.ByteArrayOutputStream;
12 + import java.io.ObjectInputStream;
13 + import java.io.ObjectOutputStream;
14 + import java.lang.management.ManagementFactory;
15 + import java.lang.management.ThreadInfo;
16 + import java.lang.reflect.Method;
17 + import java.util.ArrayList;
18   import java.util.Arrays;
19 + import java.util.Date;
20 + import java.util.Enumeration;
21 + import java.util.List;
22   import java.util.NoSuchElementException;
23   import java.util.PropertyPermission;
24   import java.util.concurrent.*;
25 + import java.util.concurrent.atomic.AtomicBoolean;
26   import java.util.concurrent.atomic.AtomicReference;
27   import static java.util.concurrent.TimeUnit.MILLISECONDS;
28   import static java.util.concurrent.TimeUnit.NANOSECONDS;
# Line 63 | Line 75 | import java.security.SecurityPermission;
75   *
76   * </ol>
77   *
78 < * <p> <b>Other notes</b>
78 > * <p><b>Other notes</b>
79   * <ul>
80   *
81   * <li> Usually, there is one testcase method per JSR166 method
# Line 136 | Line 148 | public class JSR166TestCase extends Test
148      }
149  
150      /**
151 <     * Runs all JSR166 unit tests using junit.textui.TestRunner
151 >     * Runs all JSR166 unit tests using junit.textui.TestRunner.
152 >     * Optional command line arg provides the number of iterations to
153 >     * repeat running the tests.
154       */
155      public static void main(String[] args) {
156          if (useSecurityManager) {
# Line 168 | Line 182 | public class JSR166TestCase extends Test
182          return suite;
183      }
184  
185 +    public static void addNamedTestClasses(TestSuite suite,
186 +                                           String... testClassNames) {
187 +        for (String testClassName : testClassNames) {
188 +            try {
189 +                Class<?> testClass = Class.forName(testClassName);
190 +                Method m = testClass.getDeclaredMethod("suite",
191 +                                                       new Class<?>[0]);
192 +                suite.addTest(newTestSuite((Test)m.invoke(null)));
193 +            } catch (Exception e) {
194 +                throw new Error("Missing test class", e);
195 +            }
196 +        }
197 +    }
198 +
199 +    public static final double JAVA_CLASS_VERSION;
200 +    static {
201 +        try {
202 +            JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
203 +                new java.security.PrivilegedAction<Double>() {
204 +                public Double run() {
205 +                    return Double.valueOf(System.getProperty("java.class.version"));}});
206 +        } catch (Throwable t) {
207 +            throw new Error(t);
208 +        }
209 +    }
210 +
211 +    public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
212 +    public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
213 +    public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
214 +
215      /**
216       * Collects all JSR166 unit tests as one suite.
217       */
218      public static Test suite() {
219 <        return newTestSuite(
219 >        // Java7+ test classes
220 >        TestSuite suite = newTestSuite(
221              ForkJoinPoolTest.suite(),
222              ForkJoinTaskTest.suite(),
223              RecursiveActionTest.suite(),
# Line 237 | Line 282 | public class JSR166TestCase extends Test
282              TreeSetTest.suite(),
283              TreeSubMapTest.suite(),
284              TreeSubSetTest.suite());
285 +
286 +        // Java8+ test classes
287 +        if (atLeastJava8()) {
288 +            String[] java8TestClassNames = {
289 +                "StampedLockTest",
290 +            };
291 +            addNamedTestClasses(suite, java8TestClassNames);
292 +        }
293 +
294 +        return suite;
295      }
296  
297  
# Line 254 | Line 309 | public class JSR166TestCase extends Test
309          return 50;
310      }
311  
257
312      /**
313       * Sets delays as multiples of SHORT_DELAY.
314       */
# Line 266 | Line 320 | public class JSR166TestCase extends Test
320      }
321  
322      /**
323 +     * Returns a timeout in milliseconds to be used in tests that
324 +     * verify that operations block or time out.
325 +     */
326 +    long timeoutMillis() {
327 +        return SHORT_DELAY_MS / 4;
328 +    }
329 +
330 +    /**
331 +     * Returns a new Date instance representing a time delayMillis
332 +     * milliseconds in the future.
333 +     */
334 +    Date delayedDate(long delayMillis) {
335 +        return new Date(System.currentTimeMillis() + delayMillis);
336 +    }
337 +
338 +    /**
339       * The first exception encountered if any threadAssertXXX method fails.
340       */
341      private final AtomicReference<Throwable> threadFailure
# Line 286 | Line 356 | public class JSR166TestCase extends Test
356      }
357  
358      /**
359 +     * Extra checks that get done for all test cases.
360 +     *
361       * Triggers test case failure if any thread assertions have failed,
362       * by rethrowing, in the test harness thread, any exception recorded
363       * earlier by threadRecordFailure.
364 +     *
365 +     * Triggers test case failure if interrupt status is set in the main thread.
366       */
367      public void tearDown() throws Exception {
368          Throwable t = threadFailure.getAndSet(null);
# Line 306 | Line 380 | public class JSR166TestCase extends Test
380                  throw afe;
381              }
382          }
383 +
384 +        if (Thread.interrupted())
385 +            throw new AssertionFailedError("interrupt status set in main thread");
386      }
387  
388      /**
# Line 437 | Line 514 | public class JSR166TestCase extends Test
514          else {
515              AssertionFailedError afe =
516                  new AssertionFailedError("unexpected exception: " + t);
517 <            t.initCause(t);
517 >            afe.initCause(t);
518              throw afe;
519          }
520      }
521  
522      /**
523 +     * Delays, via Thread.sleep, for the given millisecond delay, but
524 +     * if the sleep is shorter than specified, may re-sleep or yield
525 +     * until time elapses.
526 +     */
527 +    static void delay(long millis) throws InterruptedException {
528 +        long startTime = System.nanoTime();
529 +        long ns = millis * 1000 * 1000;
530 +        for (;;) {
531 +            if (millis > 0L)
532 +                Thread.sleep(millis);
533 +            else // too short to sleep
534 +                Thread.yield();
535 +            long d = ns - (System.nanoTime() - startTime);
536 +            if (d > 0L)
537 +                millis = d / (1000 * 1000);
538 +            else
539 +                break;
540 +        }
541 +    }
542 +
543 +    /**
544       * Waits out termination of a thread pool or fails doing so.
545       */
546 <    public void joinPool(ExecutorService exec) {
546 >    void joinPool(ExecutorService exec) {
547          try {
548              exec.shutdown();
549              assertTrue("ExecutorService did not terminate in a timely manner",
# Line 457 | Line 555 | public class JSR166TestCase extends Test
555          }
556      }
557  
558 +    /**
559 +     * A debugging tool to print all stack traces, as jstack does.
560 +     */
561 +    static void printAllStackTraces() {
562 +        for (ThreadInfo info :
563 +                 ManagementFactory.getThreadMXBean()
564 +                 .dumpAllThreads(true, true))
565 +            System.err.print(info);
566 +    }
567 +
568 +    /**
569 +     * Checks that thread does not terminate within the default
570 +     * millisecond delay of {@code timeoutMillis()}.
571 +     */
572 +    void assertThreadStaysAlive(Thread thread) {
573 +        assertThreadStaysAlive(thread, timeoutMillis());
574 +    }
575 +
576 +    /**
577 +     * Checks that thread does not terminate within the given millisecond delay.
578 +     */
579 +    void assertThreadStaysAlive(Thread thread, long millis) {
580 +        try {
581 +            // No need to optimize the failing case via Thread.join.
582 +            delay(millis);
583 +            assertTrue(thread.isAlive());
584 +        } catch (InterruptedException ie) {
585 +            fail("Unexpected InterruptedException");
586 +        }
587 +    }
588 +
589 +    /**
590 +     * Checks that the threads do not terminate within the default
591 +     * millisecond delay of {@code timeoutMillis()}.
592 +     */
593 +    void assertThreadsStayAlive(Thread... threads) {
594 +        assertThreadsStayAlive(timeoutMillis(), threads);
595 +    }
596 +
597 +    /**
598 +     * Checks that the threads do not terminate within the given millisecond delay.
599 +     */
600 +    void assertThreadsStayAlive(long millis, Thread... threads) {
601 +        try {
602 +            // No need to optimize the failing case via Thread.join.
603 +            delay(millis);
604 +            for (Thread thread : threads)
605 +                assertTrue(thread.isAlive());
606 +        } catch (InterruptedException ie) {
607 +            fail("Unexpected InterruptedException");
608 +        }
609 +    }
610 +
611 +    /**
612 +     * Checks that future.get times out, with the default timeout of
613 +     * {@code timeoutMillis()}.
614 +     */
615 +    void assertFutureTimesOut(Future future) {
616 +        assertFutureTimesOut(future, timeoutMillis());
617 +    }
618 +
619 +    /**
620 +     * Checks that future.get times out, with the given millisecond timeout.
621 +     */
622 +    void assertFutureTimesOut(Future future, long timeoutMillis) {
623 +        long startTime = System.nanoTime();
624 +        try {
625 +            future.get(timeoutMillis, MILLISECONDS);
626 +            shouldThrow();
627 +        } catch (TimeoutException success) {
628 +        } catch (Exception e) {
629 +            threadUnexpectedException(e);
630 +        } finally { future.cancel(true); }
631 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
632 +    }
633  
634      /**
635       * Fails with message "should throw exception".
# Line 509 | Line 682 | public class JSR166TestCase extends Test
682          SecurityManager sm = System.getSecurityManager();
683          if (sm == null) {
684              r.run();
685 +        }
686 +        runWithSecurityManagerWithPermissions(r, permissions);
687 +    }
688 +
689 +    /**
690 +     * Runs Runnable r with a security policy that permits precisely
691 +     * the specified permissions.  If there is no current security
692 +     * manager, a temporary one is set for the duration of the
693 +     * Runnable.  We require that any security manager permit
694 +     * getPolicy/setPolicy.
695 +     */
696 +    public void runWithSecurityManagerWithPermissions(Runnable r,
697 +                                                      Permission... permissions) {
698 +        SecurityManager sm = System.getSecurityManager();
699 +        if (sm == null) {
700              Policy savedPolicy = Policy.getPolicy();
701              try {
702                  Policy.setPolicy(permissivePolicy());
703                  System.setSecurityManager(new SecurityManager());
704 <                runWithPermissions(r, permissions);
704 >                runWithSecurityManagerWithPermissions(r, permissions);
705              } finally {
706                  System.setSecurityManager(null);
707                  Policy.setPolicy(savedPolicy);
# Line 561 | Line 749 | public class JSR166TestCase extends Test
749              return perms.implies(p);
750          }
751          public void refresh() {}
752 +        public String toString() {
753 +            List<Permission> ps = new ArrayList<Permission>();
754 +            for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
755 +                ps.add(e.nextElement());
756 +            return "AdjustablePolicy with permissions " + ps;
757 +        }
758      }
759  
760      /**
# Line 588 | Line 782 | public class JSR166TestCase extends Test
782       */
783      void sleep(long millis) {
784          try {
785 <            Thread.sleep(millis);
785 >            delay(millis);
786          } catch (InterruptedException ie) {
787              AssertionFailedError afe =
788                  new AssertionFailedError("Unexpected InterruptedException");
# Line 598 | Line 792 | public class JSR166TestCase extends Test
792      }
793  
794      /**
795 <     * Sleeps until the timeout has elapsed, or interrupted.
602 <     * Does <em>NOT</em> throw InterruptedException.
603 <     */
604 <    void sleepTillInterrupted(long timeoutMillis) {
605 <        try {
606 <            Thread.sleep(timeoutMillis);
607 <        } catch (InterruptedException wakeup) {}
608 <    }
609 <
610 <    /**
611 <     * Waits up to the specified number of milliseconds for the given
795 >     * Spin-waits up to the specified number of milliseconds for the given
796       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
797       */
798      void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
799 <        long timeoutNanos = timeoutMillis * 1000L * 1000L;
616 <        long t0 = System.nanoTime();
799 >        long startTime = System.nanoTime();
800          for (;;) {
801              Thread.State s = thread.getState();
802              if (s == Thread.State.BLOCKED ||
# Line 622 | Line 805 | public class JSR166TestCase extends Test
805                  return;
806              else if (s == Thread.State.TERMINATED)
807                  fail("Unexpected thread termination");
808 <            else if (System.nanoTime() - t0 > timeoutNanos) {
808 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
809                  threadAssertTrue(thread.isAlive());
810                  return;
811              }
# Line 631 | Line 814 | public class JSR166TestCase extends Test
814      }
815  
816      /**
817 +     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
818 +     * state: BLOCKED, WAITING, or TIMED_WAITING.
819 +     */
820 +    void waitForThreadToEnterWaitState(Thread thread) {
821 +        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
822 +    }
823 +
824 +    /**
825       * Returns the number of milliseconds since time given by
826       * startNanoTime, which must have been previously returned from a
827       * call to {@link System.nanoTime()}.
# Line 660 | Line 851 | public class JSR166TestCase extends Test
851          } catch (InterruptedException ie) {
852              threadUnexpectedException(ie);
853          } finally {
854 <            if (t.isAlive()) {
854 >            if (t.getState() != Thread.State.TERMINATED) {
855                  t.interrupt();
856                  fail("Test timed out");
857              }
858          }
859      }
860  
861 +    /**
862 +     * Waits for LONG_DELAY_MS milliseconds for the thread to
863 +     * terminate (using {@link Thread#join(long)}), else interrupts
864 +     * the thread (in the hope that it may terminate later) and fails.
865 +     */
866 +    void awaitTermination(Thread t) {
867 +        awaitTermination(t, LONG_DELAY_MS);
868 +    }
869 +
870      // Some convenient Runnable classes
871  
872      public abstract class CheckedRunnable implements Runnable {
# Line 729 | Line 929 | public class JSR166TestCase extends Test
929                  realRun();
930                  threadShouldThrow("InterruptedException");
931              } catch (InterruptedException success) {
932 +                threadAssertFalse(Thread.interrupted());
933              } catch (Throwable t) {
934                  threadUnexpectedException(t);
935              }
# Line 758 | Line 959 | public class JSR166TestCase extends Test
959                  threadShouldThrow("InterruptedException");
960                  return result;
961              } catch (InterruptedException success) {
962 +                threadAssertFalse(Thread.interrupted());
963              } catch (Throwable t) {
964                  threadUnexpectedException(t);
965              }
# Line 789 | Line 991 | public class JSR166TestCase extends Test
991              }};
992      }
993  
994 +    public Runnable awaiter(final CountDownLatch latch) {
995 +        return new CheckedRunnable() {
996 +            public void realRun() throws InterruptedException {
997 +                await(latch);
998 +            }};
999 +    }
1000 +
1001 +    public void await(CountDownLatch latch) {
1002 +        try {
1003 +            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1004 +        } catch (Throwable t) {
1005 +            threadUnexpectedException(t);
1006 +        }
1007 +    }
1008 +
1009 +    public void await(Semaphore semaphore) {
1010 +        try {
1011 +            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1012 +        } catch (Throwable t) {
1013 +            threadUnexpectedException(t);
1014 +        }
1015 +    }
1016 +
1017 + //     /**
1018 + //      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1019 + //      */
1020 + //     public void await(AtomicBoolean flag) {
1021 + //         await(flag, LONG_DELAY_MS);
1022 + //     }
1023 +
1024 + //     /**
1025 + //      * Spin-waits up to the specified timeout until flag becomes true.
1026 + //      */
1027 + //     public void await(AtomicBoolean flag, long timeoutMillis) {
1028 + //         long startTime = System.nanoTime();
1029 + //         while (!flag.get()) {
1030 + //             if (millisElapsedSince(startTime) > timeoutMillis)
1031 + //                 throw new AssertionFailedError("timed out");
1032 + //             Thread.yield();
1033 + //         }
1034 + //     }
1035 +
1036      public static class NPETask implements Callable<String> {
1037          public String call() { throw new NullPointerException(); }
1038      }
# Line 799 | Line 1043 | public class JSR166TestCase extends Test
1043  
1044      public class ShortRunnable extends CheckedRunnable {
1045          protected void realRun() throws Throwable {
1046 <            Thread.sleep(SHORT_DELAY_MS);
1046 >            delay(SHORT_DELAY_MS);
1047          }
1048      }
1049  
1050      public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1051          protected void realRun() throws InterruptedException {
1052 <            Thread.sleep(SHORT_DELAY_MS);
1052 >            delay(SHORT_DELAY_MS);
1053          }
1054      }
1055  
1056      public class SmallRunnable extends CheckedRunnable {
1057          protected void realRun() throws Throwable {
1058 <            Thread.sleep(SMALL_DELAY_MS);
1058 >            delay(SMALL_DELAY_MS);
1059          }
1060      }
1061  
1062      public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1063          protected void realRun() {
1064              try {
1065 <                Thread.sleep(SMALL_DELAY_MS);
1065 >                delay(SMALL_DELAY_MS);
1066              } catch (InterruptedException ok) {}
1067          }
1068      }
1069  
1070      public class SmallCallable extends CheckedCallable {
1071          protected Object realCall() throws InterruptedException {
1072 <            Thread.sleep(SMALL_DELAY_MS);
1072 >            delay(SMALL_DELAY_MS);
1073              return Boolean.TRUE;
1074          }
1075      }
1076  
1077      public class MediumRunnable extends CheckedRunnable {
1078          protected void realRun() throws Throwable {
1079 <            Thread.sleep(MEDIUM_DELAY_MS);
1079 >            delay(MEDIUM_DELAY_MS);
1080          }
1081      }
1082  
1083      public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1084          protected void realRun() throws InterruptedException {
1085 <            Thread.sleep(MEDIUM_DELAY_MS);
1085 >            delay(MEDIUM_DELAY_MS);
1086          }
1087      }
1088  
# Line 846 | Line 1090 | public class JSR166TestCase extends Test
1090          return new CheckedRunnable() {
1091              protected void realRun() {
1092                  try {
1093 <                    Thread.sleep(timeoutMillis);
1093 >                    delay(timeoutMillis);
1094                  } catch (InterruptedException ok) {}
1095              }};
1096      }
# Line 854 | Line 1098 | public class JSR166TestCase extends Test
1098      public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1099          protected void realRun() {
1100              try {
1101 <                Thread.sleep(MEDIUM_DELAY_MS);
1101 >                delay(MEDIUM_DELAY_MS);
1102              } catch (InterruptedException ok) {}
1103          }
1104      }
# Line 862 | Line 1106 | public class JSR166TestCase extends Test
1106      public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1107          protected void realRun() {
1108              try {
1109 <                Thread.sleep(LONG_DELAY_MS);
1109 >                delay(LONG_DELAY_MS);
1110              } catch (InterruptedException ok) {}
1111          }
1112      }
# Line 886 | Line 1130 | public class JSR166TestCase extends Test
1130                  public boolean isDone() { return done; }
1131                  public void run() {
1132                      try {
1133 <                        Thread.sleep(timeoutMillis);
1133 >                        delay(timeoutMillis);
1134                          done = true;
1135                      } catch (InterruptedException ok) {}
1136                  }
# Line 897 | Line 1141 | public class JSR166TestCase extends Test
1141          public volatile boolean done = false;
1142          public void run() {
1143              try {
1144 <                Thread.sleep(SHORT_DELAY_MS);
1144 >                delay(SHORT_DELAY_MS);
1145                  done = true;
1146              } catch (InterruptedException ok) {}
1147          }
# Line 907 | Line 1151 | public class JSR166TestCase extends Test
1151          public volatile boolean done = false;
1152          public void run() {
1153              try {
1154 <                Thread.sleep(SMALL_DELAY_MS);
1154 >                delay(SMALL_DELAY_MS);
1155                  done = true;
1156              } catch (InterruptedException ok) {}
1157          }
# Line 917 | Line 1161 | public class JSR166TestCase extends Test
1161          public volatile boolean done = false;
1162          public void run() {
1163              try {
1164 <                Thread.sleep(MEDIUM_DELAY_MS);
1164 >                delay(MEDIUM_DELAY_MS);
1165                  done = true;
1166              } catch (InterruptedException ok) {}
1167          }
# Line 927 | Line 1171 | public class JSR166TestCase extends Test
1171          public volatile boolean done = false;
1172          public void run() {
1173              try {
1174 <                Thread.sleep(LONG_DELAY_MS);
1174 >                delay(LONG_DELAY_MS);
1175                  done = true;
1176              } catch (InterruptedException ok) {}
1177          }
# Line 944 | Line 1188 | public class JSR166TestCase extends Test
1188          public volatile boolean done = false;
1189          public Object call() {
1190              try {
1191 <                Thread.sleep(SMALL_DELAY_MS);
1191 >                delay(SMALL_DELAY_MS);
1192                  done = true;
1193              } catch (InterruptedException ok) {}
1194              return Boolean.TRUE;
# Line 991 | Line 1235 | public class JSR166TestCase extends Test
1235      }
1236  
1237      /**
1238 <     * A CyclicBarrier that fails with AssertionFailedErrors instead
1239 <     * of throwing checked exceptions.
1238 >     * A CyclicBarrier that uses timed await and fails with
1239 >     * AssertionFailedErrors instead of throwing checked exceptions.
1240       */
1241      public class CheckedBarrier extends CyclicBarrier {
1242          public CheckedBarrier(int parties) { super(parties); }
1243  
1244          public int await() {
1245              try {
1246 <                return super.await();
1246 >                return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1247 >            } catch (TimeoutException e) {
1248 >                throw new AssertionFailedError("timed out");
1249              } catch (Exception e) {
1250                  AssertionFailedError afe =
1251                      new AssertionFailedError("Unexpected exception: " + e);
# Line 1009 | Line 1255 | public class JSR166TestCase extends Test
1255          }
1256      }
1257  
1258 <    public void checkEmpty(BlockingQueue q) {
1258 >    void checkEmpty(BlockingQueue q) {
1259          try {
1260              assertTrue(q.isEmpty());
1261              assertEquals(0, q.size());
# Line 1036 | Line 1282 | public class JSR166TestCase extends Test
1282          }
1283      }
1284  
1285 +    void assertSerialEquals(Object x, Object y) {
1286 +        assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1287 +    }
1288 +
1289 +    void assertNotSerialEquals(Object x, Object y) {
1290 +        assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1291 +    }
1292 +
1293 +    byte[] serialBytes(Object o) {
1294 +        try {
1295 +            ByteArrayOutputStream bos = new ByteArrayOutputStream();
1296 +            ObjectOutputStream oos = new ObjectOutputStream(bos);
1297 +            oos.writeObject(o);
1298 +            oos.flush();
1299 +            oos.close();
1300 +            return bos.toByteArray();
1301 +        } catch (Throwable t) {
1302 +            threadUnexpectedException(t);
1303 +            return new byte[0];
1304 +        }
1305 +    }
1306 +
1307 +    @SuppressWarnings("unchecked")
1308 +    <T> T serialClone(T o) {
1309 +        try {
1310 +            ObjectInputStream ois = new ObjectInputStream
1311 +                (new ByteArrayInputStream(serialBytes(o)));
1312 +            T clone = (T) ois.readObject();
1313 +            assertSame(o.getClass(), clone.getClass());
1314 +            return clone;
1315 +        } catch (Throwable t) {
1316 +            threadUnexpectedException(t);
1317 +            return null;
1318 +        }
1319 +    }
1320   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines