Projects >> openengsb >>cf4111a757ffab7fdaeab487e2d573bdf1861c4b

Chunk
Conflicting content 
    }

    private static String marshalSecureRequest(MethodCallRequest methodCallRequest,
<<<<<<< HEAD
            Authentication authenticationInfo)
        throws IOException, JsonGenerationException, JsonMappingException {
=======
            AuthenticationInfo authenticationInfo)
        throws IOException {
>>>>>>> f553e2cb51b8ed66f4eb61ed9a39f139c4fadc55
        BeanDescription auth = BeanDescription.fromObject(authenticationInfo);
        SecureRequest secureRequest = SecureRequest.create(methodCallRequest, auth);
        return MAPPER.writeValueAsString(secureRequest);
Solution content 
    }

    private static String marshalSecureRequest(MethodCallRequest methodCallRequest,
            Authentication authenticationInfo) throws IOException {
        BeanDescription auth = BeanDescription.fromObject(authenticationInfo);
        SecureRequest secureRequest = SecureRequest.create(methodCallRequest, auth);
        return MAPPER.writeValueAsString(secureRequest);
File
AuthenticatingSampleApp.java
Developer's decision
Manual
Kind of conflict
Variable
Chunk
Conflicting content 
    }

    private static byte[] marshalSecureRequest(MethodCallRequest methodCallRequest,
<<<<<<< HEAD
            Authentication authenticationInfo)
        throws IOException, JsonGenerationException, JsonMappingException {
=======
            AuthenticationInfo authenticationInfo) throws IOException {
>>>>>>> f553e2cb51b8ed66f4eb61ed9a39f139c4fadc55
        BeanDescription auth = BeanDescription.fromObject(authenticationInfo);
        SecureRequest secureRequest = SecureRequest.create(methodCallRequest, auth);
        return MAPPER.writeValueAsBytes(secureRequest);
Solution content 
    }

    private static byte[] marshalSecureRequest(MethodCallRequest methodCallRequest,
            Authentication authenticationInfo) throws IOException {
        BeanDescription auth = BeanDescription.fromObject(authenticationInfo);
        SecureRequest secureRequest = SecureRequest.create(methodCallRequest, auth);
        return MAPPER.writeValueAsBytes(secureRequest);
File
SecureSampleApp.java
Developer's decision
Manual
Kind of conflict
Variable