Projects >> graylog2-server >>9b306704b40fa3c4e656b772cbbc27d4e60cbe2c

Chunk
Conflicting content
                        } finally {
                            doneSignal.countDown();
                        }
<<<<<<< HEAD
                    });
                } catch (Exception e) {
                    LOG.error("Could not write message batch to output [" + output.getName() +"].", e);
                    doneSignal.countDown();
                }
            }

            // Wait until all writer threads have finished or timeout is reached.
            if (!doneSignal.await(10, TimeUnit.SECONDS)) {
                LOG.warn("Timeout reached. Not waiting any longer for writer threads to complete.");
=======
                    }
                });

            } catch (Exception e) {
                LOG.error("Could not write message batch to output [" + output.getName() +"].", e);
                doneSignal.countDown();
>>>>>>> f1c6452b7962848f288ad567caea23a1cf56c6c9
            }
        }
Solution content
                        } finally {
                            doneSignal.countDown();
                        }
                    }
                });

            } catch (Exception e) {
                LOG.error("Could not write message batch to output [" + output.getName() +"].", e);
                doneSignal.countDown();
            }
        }
File
OutputBufferProcessor.java
Developer's decision
Version 2
Kind of conflict
Catch clause
Comment
If statement
Method invocation