Projects >> SOCIETIES-Platform >>09ca67e45c37b871b61c676508aff0529cf09653

Chunk
Conflicting content 
 */
public class ServiceTest {

<<<<<<< HEAD:platform-infrastructure/security/PolicyNegotiator/src/test/java/org/societies/security/model/ServiceTest.java
=======
	public Service(String id, String slaXmlOptions, URI fileServerHost, List files) {
		
		this.id = id;
		this.slaXmlOptions = slaXmlOptions;
		this.fileServerHost = fileServerHost;
		this.files = files;

		if (LOG.isDebugEnabled()) {
			LOG.debug("Service(" + id + ", ..., " + fileServerHost + ", " + files + ")");
		}
	}
	
	/**
	 * @return the id
	 */
	public String getId() {
		return id;
	}
	
>>>>>>> ddabc938905ed0392997e6d750c5b4d1365a36f6:platform-infrastructure/security/PolicyNegotiator/src/main/java/org/societies/security/policynegotiator/provider/Service.java
	/**
	 * @throws java.lang.Exception
	 */
Solution content 
 */
public class ServiceTest {

	/**
	 * @throws java.lang.Exception
	 */
File
ServiceTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
	@Override
	public void logContext(Requestor requestor, IIdentity owner) {
		
<<<<<<< HEAD
		LOG.debug("logContext({}, ...)", requestor);
=======
		if (LOG.isDebugEnabled()) {
			LOG.debug("logContext()");
		}
>>>>>>> ddabc938905ed0392997e6d750c5b4d1365a36f6
		
		String invokerClass = getInvokerClass();
		List invokerClasses = getInvokerClasses();
Solution content 
	@Override
	public void logContext(Requestor requestor, IIdentity owner) {
		
		if (LOG.isDebugEnabled()) {
			LOG.debug("logContext()");
		}
		
		String invokerClass = getInvokerClass();
		List invokerClasses = getInvokerClasses();
File
PrivacyLogAppender.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
	@Override
	public void logContext(Requestor requestor, IIdentity owner, int dataSize) {
		
<<<<<<< HEAD
		LOG.debug("logContext({}, {}, ...)", requestor, dataSize);
=======
		if (LOG.isDebugEnabled()) {
			LOG.debug("logContext({})", dataSize);
		}
>>>>>>> ddabc938905ed0392997e6d750c5b4d1365a36f6

		String invokerClass = getInvokerClass();
		List invokerClasses = getInvokerClasses();
Solution content 
	@Override
	public void logContext(Requestor requestor, IIdentity owner, int dataSize) {
		
		if (LOG.isDebugEnabled()) {
			LOG.debug("logContext({})", dataSize);
		}

		String invokerClass = getInvokerClass();
		List invokerClasses = getInvokerClasses();
File
PrivacyLogAppender.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation