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.61 by jsr166, Mon Oct 11 03:54:10 2010 UTC vs.
Revision 1.95 by jsr166, Mon Jan 21 19:43:52 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.util.ArrayList;
15 + import java.util.Arrays;
16 + import java.util.Date;
17 + import java.util.Enumeration;
18 + import java.util.List;
19 + import java.util.NoSuchElementException;
20   import java.util.PropertyPermission;
21   import java.util.concurrent.*;
22 + import java.util.concurrent.atomic.AtomicBoolean;
23   import java.util.concurrent.atomic.AtomicReference;
24   import static java.util.concurrent.TimeUnit.MILLISECONDS;
25 + import static java.util.concurrent.TimeUnit.NANOSECONDS;
26   import java.security.CodeSource;
27   import java.security.Permission;
28   import java.security.PermissionCollection;
# Line 60 | Line 72 | import java.security.SecurityPermission;
72   *
73   * </ol>
74   *
75 < * <p> <b>Other notes</b>
75 > * <p><b>Other notes</b>
76   * <ul>
77   *
78   * <li> Usually, there is one testcase method per JSR166 method
# Line 96 | Line 108 | public class JSR166TestCase extends Test
108      private static final boolean useSecurityManager =
109          Boolean.getBoolean("jsr166.useSecurityManager");
110  
111 +    protected static final boolean expensiveTests =
112 +        Boolean.getBoolean("jsr166.expensiveTests");
113 +
114      /**
115       * If true, report on stdout all "slow" tests, that is, ones that
116       * take more than profileThreshold milliseconds to execute.
# Line 128 | Line 143 | public class JSR166TestCase extends Test
143                  System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
144          }
145      }
146 <    
146 >
147      /**
148 <     * Runs all JSR166 unit tests using junit.textui.TestRunner
148 >     * Runs all JSR166 unit tests using junit.textui.TestRunner.
149 >     * Optional command line arg provides the number of iterations to
150 >     * repeat running the tests.
151       */
152      public static void main(String[] args) {
153          if (useSecurityManager) {
# Line 248 | Line 265 | public class JSR166TestCase extends Test
265          return 50;
266      }
267  
251
268      /**
269       * Sets delays as multiples of SHORT_DELAY.
270       */
# Line 256 | Line 272 | public class JSR166TestCase extends Test
272          SHORT_DELAY_MS = getShortDelay();
273          SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
274          MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
275 <        LONG_DELAY_MS   = SHORT_DELAY_MS * 50;
275 >        LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
276 >    }
277 >
278 >    /**
279 >     * Returns a timeout in milliseconds to be used in tests that
280 >     * verify that operations block or time out.
281 >     */
282 >    long timeoutMillis() {
283 >        return SHORT_DELAY_MS / 4;
284 >    }
285 >
286 >    /**
287 >     * Returns a new Date instance representing a time delayMillis
288 >     * milliseconds in the future.
289 >     */
290 >    Date delayedDate(long delayMillis) {
291 >        return new Date(System.currentTimeMillis() + delayMillis);
292      }
293  
294      /**
# Line 280 | Line 312 | public class JSR166TestCase extends Test
312      }
313  
314      /**
315 +     * Extra checks that get done for all test cases.
316 +     *
317       * Triggers test case failure if any thread assertions have failed,
318       * by rethrowing, in the test harness thread, any exception recorded
319       * earlier by threadRecordFailure.
320 +     *
321 +     * Triggers test case failure if interrupt status is set in the main thread.
322       */
323      public void tearDown() throws Exception {
324 <        Throwable t = threadFailure.get();
324 >        Throwable t = threadFailure.getAndSet(null);
325          if (t != null) {
326              if (t instanceof Error)
327                  throw (Error) t;
# Line 300 | Line 336 | public class JSR166TestCase extends Test
336                  throw afe;
337              }
338          }
339 +
340 +        if (Thread.interrupted())
341 +            throw new AssertionFailedError("interrupt status set in main thread");
342      }
343  
344      /**
# Line 431 | Line 470 | public class JSR166TestCase extends Test
470          else {
471              AssertionFailedError afe =
472                  new AssertionFailedError("unexpected exception: " + t);
473 <            t.initCause(t);
473 >            afe.initCause(t);
474              throw afe;
475          }
476      }
477  
478      /**
479 +     * Delays, via Thread.sleep, for the given millisecond delay, but
480 +     * if the sleep is shorter than specified, may re-sleep or yield
481 +     * until time elapses.
482 +     */
483 +    static void delay(long millis) throws InterruptedException {
484 +        long startTime = System.nanoTime();
485 +        long ns = millis * 1000 * 1000;
486 +        for (;;) {
487 +            if (millis > 0L)
488 +                Thread.sleep(millis);
489 +            else // too short to sleep
490 +                Thread.yield();
491 +            long d = ns - (System.nanoTime() - startTime);
492 +            if (d > 0L)
493 +                millis = d / (1000 * 1000);
494 +            else
495 +                break;
496 +        }
497 +    }
498 +
499 +    /**
500       * Waits out termination of a thread pool or fails doing so.
501       */
502 <    public void joinPool(ExecutorService exec) {
502 >    void joinPool(ExecutorService exec) {
503          try {
504              exec.shutdown();
505              assertTrue("ExecutorService did not terminate in a timely manner",
506 <                       exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
506 >                       exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
507          } catch (SecurityException ok) {
508              // Allowed in case test doesn't have privs
509          } catch (InterruptedException ie) {
# Line 451 | Line 511 | public class JSR166TestCase extends Test
511          }
512      }
513  
514 +    /**
515 +     * A debugging tool to print all stack traces, as jstack does.
516 +     */
517 +    void printAllStackTraces() {
518 +        System.err.println(
519 +            Arrays.toString(
520 +                java.lang.management.ManagementFactory.getThreadMXBean()
521 +                .dumpAllThreads(true, true)));
522 +    }
523 +
524 +    /**
525 +     * Checks that thread does not terminate within the default
526 +     * millisecond delay of {@code timeoutMillis()}.
527 +     */
528 +    void assertThreadStaysAlive(Thread thread) {
529 +        assertThreadStaysAlive(thread, timeoutMillis());
530 +    }
531 +
532 +    /**
533 +     * Checks that thread does not terminate within the given millisecond delay.
534 +     */
535 +    void assertThreadStaysAlive(Thread thread, long millis) {
536 +        try {
537 +            // No need to optimize the failing case via Thread.join.
538 +            delay(millis);
539 +            assertTrue(thread.isAlive());
540 +        } catch (InterruptedException ie) {
541 +            fail("Unexpected InterruptedException");
542 +        }
543 +    }
544 +
545 +    /**
546 +     * Checks that the threads do not terminate within the default
547 +     * millisecond delay of {@code timeoutMillis()}.
548 +     */
549 +    void assertThreadsStayAlive(Thread... threads) {
550 +        assertThreadsStayAlive(timeoutMillis(), threads);
551 +    }
552 +
553 +    /**
554 +     * Checks that the threads do not terminate within the given millisecond delay.
555 +     */
556 +    void assertThreadsStayAlive(long millis, Thread... threads) {
557 +        try {
558 +            // No need to optimize the failing case via Thread.join.
559 +            delay(millis);
560 +            for (Thread thread : threads)
561 +                assertTrue(thread.isAlive());
562 +        } catch (InterruptedException ie) {
563 +            fail("Unexpected InterruptedException");
564 +        }
565 +    }
566 +
567 +    /**
568 +     * Checks that future.get times out, with the default timeout of
569 +     * {@code timeoutMillis()}.
570 +     */
571 +    void assertFutureTimesOut(Future future) {
572 +        assertFutureTimesOut(future, timeoutMillis());
573 +    }
574 +
575 +    /**
576 +     * Checks that future.get times out, with the given millisecond timeout.
577 +     */
578 +    void assertFutureTimesOut(Future future, long timeoutMillis) {
579 +        long startTime = System.nanoTime();
580 +        try {
581 +            future.get(timeoutMillis, MILLISECONDS);
582 +            shouldThrow();
583 +        } catch (TimeoutException success) {
584 +        } catch (Exception e) {
585 +            threadUnexpectedException(e);
586 +        } finally { future.cancel(true); }
587 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
588 +    }
589  
590      /**
591       * Fails with message "should throw exception".
# Line 503 | Line 638 | public class JSR166TestCase extends Test
638          SecurityManager sm = System.getSecurityManager();
639          if (sm == null) {
640              r.run();
641 +        }
642 +        runWithSecurityManagerWithPermissions(r, permissions);
643 +    }
644 +
645 +    /**
646 +     * Runs Runnable r with a security policy that permits precisely
647 +     * the specified permissions.  If there is no current security
648 +     * manager, a temporary one is set for the duration of the
649 +     * Runnable.  We require that any security manager permit
650 +     * getPolicy/setPolicy.
651 +     */
652 +    public void runWithSecurityManagerWithPermissions(Runnable r,
653 +                                                      Permission... permissions) {
654 +        SecurityManager sm = System.getSecurityManager();
655 +        if (sm == null) {
656              Policy savedPolicy = Policy.getPolicy();
657              try {
658                  Policy.setPolicy(permissivePolicy());
659                  System.setSecurityManager(new SecurityManager());
660 <                runWithPermissions(r, permissions);
660 >                runWithSecurityManagerWithPermissions(r, permissions);
661              } finally {
662                  System.setSecurityManager(null);
663                  Policy.setPolicy(savedPolicy);
# Line 555 | Line 705 | public class JSR166TestCase extends Test
705              return perms.implies(p);
706          }
707          public void refresh() {}
708 +        public String toString() {
709 +            List<Permission> ps = new ArrayList<Permission>();
710 +            for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
711 +                ps.add(e.nextElement());
712 +            return "AdjustablePolicy with permissions " + ps;
713 +        }
714      }
715  
716      /**
# Line 582 | Line 738 | public class JSR166TestCase extends Test
738       */
739      void sleep(long millis) {
740          try {
741 <            Thread.sleep(millis);
741 >            delay(millis);
742          } catch (InterruptedException ie) {
743              AssertionFailedError afe =
744                  new AssertionFailedError("Unexpected InterruptedException");
# Line 592 | Line 748 | public class JSR166TestCase extends Test
748      }
749  
750      /**
751 <     * Sleeps until the timeout has elapsed, or interrupted.
752 <     * Does <em>NOT</em> throw InterruptedException.
751 >     * Spin-waits up to the specified number of milliseconds for the given
752 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
753       */
754 <    void sleepTillInterrupted(long timeoutMillis) {
755 <        try {
756 <            Thread.sleep(timeoutMillis);
757 <        } catch (InterruptedException wakeup) {}
754 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
755 >        long startTime = System.nanoTime();
756 >        for (;;) {
757 >            Thread.State s = thread.getState();
758 >            if (s == Thread.State.BLOCKED ||
759 >                s == Thread.State.WAITING ||
760 >                s == Thread.State.TIMED_WAITING)
761 >                return;
762 >            else if (s == Thread.State.TERMINATED)
763 >                fail("Unexpected thread termination");
764 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
765 >                threadAssertTrue(thread.isAlive());
766 >                return;
767 >            }
768 >            Thread.yield();
769 >        }
770 >    }
771 >
772 >    /**
773 >     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
774 >     * state: BLOCKED, WAITING, or TIMED_WAITING.
775 >     */
776 >    void waitForThreadToEnterWaitState(Thread thread) {
777 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
778 >    }
779 >
780 >    /**
781 >     * Returns the number of milliseconds since time given by
782 >     * startNanoTime, which must have been previously returned from a
783 >     * call to {@link System.nanoTime()}.
784 >     */
785 >    long millisElapsedSince(long startNanoTime) {
786 >        return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
787      }
788  
789      /**
# Line 622 | Line 807 | public class JSR166TestCase extends Test
807          } catch (InterruptedException ie) {
808              threadUnexpectedException(ie);
809          } finally {
810 <            if (t.isAlive()) {
810 >            if (t.getState() != Thread.State.TERMINATED) {
811                  t.interrupt();
812                  fail("Test timed out");
813              }
814          }
815      }
816  
817 +    /**
818 +     * Waits for LONG_DELAY_MS milliseconds for the thread to
819 +     * terminate (using {@link Thread#join(long)}), else interrupts
820 +     * the thread (in the hope that it may terminate later) and fails.
821 +     */
822 +    void awaitTermination(Thread t) {
823 +        awaitTermination(t, LONG_DELAY_MS);
824 +    }
825 +
826      // Some convenient Runnable classes
827  
828      public abstract class CheckedRunnable implements Runnable {
# Line 691 | Line 885 | public class JSR166TestCase extends Test
885                  realRun();
886                  threadShouldThrow("InterruptedException");
887              } catch (InterruptedException success) {
888 +                threadAssertFalse(Thread.interrupted());
889              } catch (Throwable t) {
890                  threadUnexpectedException(t);
891              }
# Line 720 | Line 915 | public class JSR166TestCase extends Test
915                  threadShouldThrow("InterruptedException");
916                  return result;
917              } catch (InterruptedException success) {
918 +                threadAssertFalse(Thread.interrupted());
919              } catch (Throwable t) {
920                  threadUnexpectedException(t);
921              }
# Line 743 | Line 939 | public class JSR166TestCase extends Test
939  
940      public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
941          return new CheckedCallable<String>() {
942 <            public String realCall() {
942 >            protected String realCall() {
943                  try {
944                      latch.await();
945                  } catch (InterruptedException quittingTime) {}
# Line 751 | Line 947 | public class JSR166TestCase extends Test
947              }};
948      }
949  
950 +    public Runnable awaiter(final CountDownLatch latch) {
951 +        return new CheckedRunnable() {
952 +            public void realRun() throws InterruptedException {
953 +                await(latch);
954 +            }};
955 +    }
956 +
957 +    public void await(CountDownLatch latch) {
958 +        try {
959 +            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
960 +        } catch (Throwable t) {
961 +            threadUnexpectedException(t);
962 +        }
963 +    }
964 +
965 +    public void await(Semaphore semaphore) {
966 +        try {
967 +            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
968 +        } catch (Throwable t) {
969 +            threadUnexpectedException(t);
970 +        }
971 +    }
972 +
973 + //     /**
974 + //      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
975 + //      */
976 + //     public void await(AtomicBoolean flag) {
977 + //         await(flag, LONG_DELAY_MS);
978 + //     }
979 +
980 + //     /**
981 + //      * Spin-waits up to the specified timeout until flag becomes true.
982 + //      */
983 + //     public void await(AtomicBoolean flag, long timeoutMillis) {
984 + //         long startTime = System.nanoTime();
985 + //         while (!flag.get()) {
986 + //             if (millisElapsedSince(startTime) > timeoutMillis)
987 + //                 throw new AssertionFailedError("timed out");
988 + //             Thread.yield();
989 + //         }
990 + //     }
991 +
992      public static class NPETask implements Callable<String> {
993          public String call() { throw new NullPointerException(); }
994      }
# Line 761 | Line 999 | public class JSR166TestCase extends Test
999  
1000      public class ShortRunnable extends CheckedRunnable {
1001          protected void realRun() throws Throwable {
1002 <            Thread.sleep(SHORT_DELAY_MS);
1002 >            delay(SHORT_DELAY_MS);
1003          }
1004      }
1005  
1006      public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1007          protected void realRun() throws InterruptedException {
1008 <            Thread.sleep(SHORT_DELAY_MS);
1008 >            delay(SHORT_DELAY_MS);
1009          }
1010      }
1011  
1012      public class SmallRunnable extends CheckedRunnable {
1013          protected void realRun() throws Throwable {
1014 <            Thread.sleep(SMALL_DELAY_MS);
1014 >            delay(SMALL_DELAY_MS);
1015          }
1016      }
1017  
1018      public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1019          protected void realRun() {
1020              try {
1021 <                Thread.sleep(SMALL_DELAY_MS);
1021 >                delay(SMALL_DELAY_MS);
1022              } catch (InterruptedException ok) {}
1023          }
1024      }
1025  
1026      public class SmallCallable extends CheckedCallable {
1027          protected Object realCall() throws InterruptedException {
1028 <            Thread.sleep(SMALL_DELAY_MS);
1028 >            delay(SMALL_DELAY_MS);
1029              return Boolean.TRUE;
1030          }
1031      }
1032  
1033      public class MediumRunnable extends CheckedRunnable {
1034          protected void realRun() throws Throwable {
1035 <            Thread.sleep(MEDIUM_DELAY_MS);
1035 >            delay(MEDIUM_DELAY_MS);
1036          }
1037      }
1038  
1039      public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1040          protected void realRun() throws InterruptedException {
1041 <            Thread.sleep(MEDIUM_DELAY_MS);
1041 >            delay(MEDIUM_DELAY_MS);
1042          }
1043      }
1044  
1045 +    public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1046 +        return new CheckedRunnable() {
1047 +            protected void realRun() {
1048 +                try {
1049 +                    delay(timeoutMillis);
1050 +                } catch (InterruptedException ok) {}
1051 +            }};
1052 +    }
1053 +
1054      public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1055          protected void realRun() {
1056              try {
1057 <                Thread.sleep(MEDIUM_DELAY_MS);
1057 >                delay(MEDIUM_DELAY_MS);
1058              } catch (InterruptedException ok) {}
1059          }
1060      }
# Line 815 | Line 1062 | public class JSR166TestCase extends Test
1062      public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1063          protected void realRun() {
1064              try {
1065 <                Thread.sleep(LONG_DELAY_MS);
1065 >                delay(LONG_DELAY_MS);
1066              } catch (InterruptedException ok) {}
1067          }
1068      }
# Line 839 | Line 1086 | public class JSR166TestCase extends Test
1086                  public boolean isDone() { return done; }
1087                  public void run() {
1088                      try {
1089 <                        Thread.sleep(timeoutMillis);
1089 >                        delay(timeoutMillis);
1090                          done = true;
1091                      } catch (InterruptedException ok) {}
1092                  }
# Line 850 | Line 1097 | public class JSR166TestCase extends Test
1097          public volatile boolean done = false;
1098          public void run() {
1099              try {
1100 <                Thread.sleep(SHORT_DELAY_MS);
1100 >                delay(SHORT_DELAY_MS);
1101                  done = true;
1102              } catch (InterruptedException ok) {}
1103          }
# Line 860 | Line 1107 | public class JSR166TestCase extends Test
1107          public volatile boolean done = false;
1108          public void run() {
1109              try {
1110 <                Thread.sleep(SMALL_DELAY_MS);
1110 >                delay(SMALL_DELAY_MS);
1111                  done = true;
1112              } catch (InterruptedException ok) {}
1113          }
# Line 870 | Line 1117 | public class JSR166TestCase extends Test
1117          public volatile boolean done = false;
1118          public void run() {
1119              try {
1120 <                Thread.sleep(MEDIUM_DELAY_MS);
1120 >                delay(MEDIUM_DELAY_MS);
1121                  done = true;
1122              } catch (InterruptedException ok) {}
1123          }
# Line 880 | Line 1127 | public class JSR166TestCase extends Test
1127          public volatile boolean done = false;
1128          public void run() {
1129              try {
1130 <                Thread.sleep(LONG_DELAY_MS);
1130 >                delay(LONG_DELAY_MS);
1131                  done = true;
1132              } catch (InterruptedException ok) {}
1133          }
# Line 897 | Line 1144 | public class JSR166TestCase extends Test
1144          public volatile boolean done = false;
1145          public Object call() {
1146              try {
1147 <                Thread.sleep(SMALL_DELAY_MS);
1147 >                delay(SMALL_DELAY_MS);
1148                  done = true;
1149              } catch (InterruptedException ok) {}
1150              return Boolean.TRUE;
# Line 944 | Line 1191 | public class JSR166TestCase extends Test
1191      }
1192  
1193      /**
1194 <     * A CyclicBarrier that fails with AssertionFailedErrors instead
1195 <     * of throwing checked exceptions.
1194 >     * A CyclicBarrier that uses timed await and fails with
1195 >     * AssertionFailedErrors instead of throwing checked exceptions.
1196       */
1197      public class CheckedBarrier extends CyclicBarrier {
1198          public CheckedBarrier(int parties) { super(parties); }
1199  
1200          public int await() {
1201              try {
1202 <                return super.await();
1202 >                return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1203 >            } catch (TimeoutException e) {
1204 >                throw new AssertionFailedError("timed out");
1205              } catch (Exception e) {
1206                  AssertionFailedError afe =
1207                      new AssertionFailedError("Unexpected exception: " + e);
# Line 962 | Line 1211 | public class JSR166TestCase extends Test
1211          }
1212      }
1213  
1214 +    void checkEmpty(BlockingQueue q) {
1215 +        try {
1216 +            assertTrue(q.isEmpty());
1217 +            assertEquals(0, q.size());
1218 +            assertNull(q.peek());
1219 +            assertNull(q.poll());
1220 +            assertNull(q.poll(0, MILLISECONDS));
1221 +            assertEquals(q.toString(), "[]");
1222 +            assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1223 +            assertFalse(q.iterator().hasNext());
1224 +            try {
1225 +                q.element();
1226 +                shouldThrow();
1227 +            } catch (NoSuchElementException success) {}
1228 +            try {
1229 +                q.iterator().next();
1230 +                shouldThrow();
1231 +            } catch (NoSuchElementException success) {}
1232 +            try {
1233 +                q.remove();
1234 +                shouldThrow();
1235 +            } catch (NoSuchElementException success) {}
1236 +        } catch (InterruptedException ie) {
1237 +            threadUnexpectedException(ie);
1238 +        }
1239 +    }
1240 +
1241 +    void assertSerialEquals(Object x, Object y) {
1242 +        assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1243 +    }
1244 +
1245 +    void assertNotSerialEquals(Object x, Object y) {
1246 +        assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1247 +    }
1248 +
1249 +    byte[] serialBytes(Object o) {
1250 +        try {
1251 +            ByteArrayOutputStream bos = new ByteArrayOutputStream();
1252 +            ObjectOutputStream oos = new ObjectOutputStream(bos);
1253 +            oos.writeObject(o);
1254 +            oos.flush();
1255 +            oos.close();
1256 +            return bos.toByteArray();
1257 +        } catch (Throwable t) {
1258 +            threadUnexpectedException(t);
1259 +            return new byte[0];
1260 +        }
1261 +    }
1262 +
1263 +    @SuppressWarnings("unchecked")
1264 +    <T> T serialClone(T o) {
1265 +        try {
1266 +            ObjectInputStream ois = new ObjectInputStream
1267 +                (new ByteArrayInputStream(serialBytes(o)));
1268 +            T clone = (T) ois.readObject();
1269 +            assertSame(o.getClass(), clone.getClass());
1270 +            return clone;
1271 +        } catch (Throwable t) {
1272 +            threadUnexpectedException(t);
1273 +            return null;
1274 +        }
1275 +    }
1276   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines