Projects >> atmosphere >>48a0c5212a94377f0cf1053df1450b74dd77f28e

Chunk
Conflicting content 
            Throwable cause = e.getCause();
            if (cause != null) {
<<<<<<< HEAD
                logger.error("Real error: {}", cause.getMessage(), cause);
=======
                logger.error("Real error: {}, error: {}", cause.getMessage(), cause);
>>>>>>> 39eb04ad68b235cbef0d1bff012fcdfafc688db7
            }
            return null;
        }
Solution content 
            Throwable cause = e.getCause();
            if (cause != null) {
                logger.error("Real error: {}", cause.getMessage(), cause);
            }
            return null;
        }
File
DefaultAsyncSupportResolver.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
            logger.error("Failed to create AsyncSupport class: {}, error: {}", targetClassFQN, e);
            Throwable cause = e.getCause();
            if (cause != null) {
<<<<<<< HEAD
                logger.error("Real error: {}", cause.getMessage(), cause);
=======
                logger.error("Real error: {}, error: {}", cause.getMessage(), cause);
>>>>>>> 39eb04ad68b235cbef0d1bff012fcdfafc688db7
            }
            throw new IllegalArgumentException("Unable to create " + targetClassFQN, e);
        }
Solution content 
            logger.error("Failed to create AsyncSupport class: {}, error: {}", targetClassFQN, e);
            Throwable cause = e.getCause();
            if (cause != null) {
                logger.error("Real error: {}", cause.getMessage(), cause);
            }
            throw new IllegalArgumentException("Unable to create " + targetClassFQN, e);
        }
File
DefaultAsyncSupportResolver.java
Developer's decision
Version 1
Kind of conflict
Method invocation