Restore of interrupt status after catch of InterruptedException was added

common/src/main/java/io/netty/util/internal/ThreadLocalRandom.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 The Netty Project
+ * Copyright 2014 The Netty Project
  *
  * The Netty Project licenses this file to you under the Apache License,
  * version 2.0 (the "License"); you may not use this file except in compliance
@@ -110,8 +110,9 @@ public class ThreadLocalRandom extends Random {
                         initialSeedUniquifier = result;
                         break;
                     }
-                } catch (InterruptedException ignore) {
+                } catch (InterruptedException e) {
-                    // Ignore
+                    // restore interrupt status because we don't know how to/don't need to handle it here
+                    Thread.currentThread().interrupt();
                 }
             }
 

common/src/test/java/io/netty/util/internal/ThreadLocalRandomTest.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2014 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package io.netty.util.internal;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class ThreadLocalRandomTest {
+
+    @Test
+    public void getInitialSeedUniquifierPreservesInterrupt() {
+        try {
+            Thread.currentThread().interrupt();
+            assertTrue("Assert that thread is interrupted before invocation of getInitialSeedUniquifier()",
+                    Thread.currentThread().isInterrupted());
+            ThreadLocalRandom.getInitialSeedUniquifier();
+            assertTrue("Assert that thread is interrupted after invocation of getInitialSeedUniquifier()",
+                    Thread.currentThread().isInterrupted());
+        } finally {
+            Thread.interrupted(); // clear interrupted status in order to not affect other tests
+        }
+    }
+}