Projects >> graylog2-server >>f8df565930b21440283eb4eb9bee815be8f3edf7

Chunk
Conflicting content 
            Log.crit("Invalid compression data format in GELF message: " + e.toString());
        } catch (java.io.UnsupportedEncodingException e) {
            Log.crit("Invalid enconding of GELF message: " + e.toString());
<<<<<<< HEAD
        } catch (java.io.EOFException e) {
            Log.crit("EOF Exception while handling GELF message: " + e.toString());
        } catch (java.net.SocketException e) {
            Log.crit("SocketException while handling GELF message: " + e.toString());
=======
>>>>>>> 6b28c74362346fbdb35f619a3d0547851d0a0bc5
        } catch (java.io.IOException e) {
            Log.crit("IO Error while handling GELF message: " + e.toString());
        } catch (Exception e) {
Solution content 
            Log.crit("Invalid compression data format in GELF message: " + e.toString());
        } catch (java.io.UnsupportedEncodingException e) {
            Log.crit("Invalid enconding of GELF message: " + e.toString());
        } catch (java.io.EOFException e) {
            Log.crit("EOF Exception while handling GELF message: " + e.toString());
        } catch (java.net.SocketException e) {
            Log.crit("SocketException while handling GELF message: " + e.toString());
        } catch (java.io.IOException e) {
            Log.crit("IO Error while handling GELF message: " + e.toString());
        } catch (Exception e) {
File
GELFClientHandlerThread.java
Developer's decision
Version 1
Kind of conflict
Catch clause
Method invocation