Projects >> android_libcore >>17f2da12ca6f0b5b80d50d11e80d3b5f877b989d

Chunk
Conflicting content 
    private Socket[] sockets;

<<<<<<< HEAD
=======
    @Override protected void setUp() throws Exception {
        // Clear the interrupted bit to make sure an earlier test did
        // not leave us in a bad state.
        Thread.interrupted();
        super.tearDown();
    }

>>>>>>> 3c473504c37c2f91053a1099f207ad8b7cc551f4
    @Override protected void tearDown() throws Exception {
        if (sockets != null) {
            sockets[0].close();
Solution content 
    private Socket[] sockets;

    @Override protected void setUp() throws Exception {
        // Clear the interrupted bit to make sure an earlier test did
        // not leave us in a bad state.
        Thread.interrupted();
        super.tearDown();
    }

    @Override protected void tearDown() throws Exception {
        if (sockets != null) {
            sockets[0].close();
File
InterruptedStreamTest.java
Developer's decision
Version 2
Kind of conflict
Method declaration
Chunk
Conflicting content 
            in.read();
            fail();
        } catch (InterruptedIOException expected) {
<<<<<<< HEAD
=======
        } finally {
            confirmInterrupted(thread);
>>>>>>> 3c473504c37c2f91053a1099f207ad8b7cc551f4
        }
    }
Solution content 
            in.read();
            fail();
        } catch (InterruptedIOException expected) {
        } finally {
            confirmInterrupted(thread);
        }
    }
File
InterruptedStreamTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
            reader.read();
            fail();
        } catch (InterruptedIOException expected) {
<<<<<<< HEAD
=======
        } finally {
            confirmInterrupted(thread);
>>>>>>> 3c473504c37c2f91053a1099f207ad8b7cc551f4
        }
    }
Solution content 
            reader.read();
            fail();
        } catch (InterruptedIOException expected) {
        } finally {
            confirmInterrupted(thread);
        }
    }
File
InterruptedStreamTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
    }
            channel.read(ByteBuffer.allocate(BUFFER_SIZE));
            fail();
        } catch (ClosedByInterruptException expected) {
<<<<<<< HEAD
=======
        } finally {
            confirmInterrupted(thread);
>>>>>>> 3c473504c37c2f91053a1099f207ad8b7cc551f4
        }
Solution content 
            channel.read(ByteBuffer.allocate(BUFFER_SIZE));
            fail();
        } catch (ClosedByInterruptException expected) {
        } finally {
            confirmInterrupted(thread);
        }
    }
File
InterruptedStreamTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
                out.write(new byte[BUFFER_SIZE]);
            }
        } catch (InterruptedIOException expected) {
<<<<<<< HEAD
=======
        } finally {
            confirmInterrupted(thread);
>>>>>>> 3c473504c37c2f91053a1099f207ad8b7cc551f4
        }
    }
Solution content 
                out.write(new byte[BUFFER_SIZE]);
            }
        } catch (InterruptedIOException expected) {
        } finally {
            confirmInterrupted(thread);
        }
    }
File
InterruptedStreamTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
                writer.write(new char[BUFFER_SIZE]);
            }
        } catch (InterruptedIOException expected) {
<<<<<<< HEAD
=======
        } finally {
            confirmInterrupted(thread);
>>>>>>> 3c473504c37c2f91053a1099f207ad8b7cc551f4
        }
    }
Solution content 
                writer.write(new char[BUFFER_SIZE]);
            }
        } catch (InterruptedIOException expected) {
        } finally {
            confirmInterrupted(thread);
        }
    }
File
InterruptedStreamTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
            }
        } catch (ClosedByInterruptException expected) {
        } catch (ClosedChannelException expected) {
<<<<<<< HEAD
=======
        } finally {
            confirmInterrupted(thread);
>>>>>>> 3c473504c37c2f91053a1099f207ad8b7cc551f4
        }
    }
Solution content 
            }
        } catch (ClosedByInterruptException expected) {
        } catch (ClosedChannelException expected) {
        } finally {
            confirmInterrupted(thread);
        }
    }
File
InterruptedStreamTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
        thread.join();
                }
                toInterrupt.interrupt();
            }
<<<<<<< HEAD
        }).start();
=======
        });
        thread.start();
        return thread;
    }

    private static void confirmInterrupted(Thread thread) throws InterruptedException {
        // validate and clear interrupted bit before join
        assertTrue(Thread.interrupted());
>>>>>>> 3c473504c37c2f91053a1099f207ad8b7cc551f4
    }
}
Solution content 
                }
                toInterrupt.interrupt();
            }
        });
        thread.start();
        return thread;
    }

    private static void confirmInterrupted(Thread thread) throws InterruptedException {
        // validate and clear interrupted bit before join
        assertTrue(Thread.interrupted());
        thread.join();
    }
}
File
InterruptedStreamTest.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Method signature
Return statement
Variable