Projects >> ccnx >>19322b6b9aa76617b0404fdbee8d3c4a3ebf56b0

Chunk
Conflicting content 
import java.util.TreeMap;
import java.util.logging.Level;

<<<<<<< HEAD
=======
import org.ccnx.ccn.impl.CCNNetworkManager;
import org.ccnx.ccn.impl.support.DataUtils;
>>>>>>> fa001ae3890bb11bf96bd2f412c41dcfc94098f1
import org.ccnx.ccn.impl.support.Log;
import org.ccnx.ccn.io.content.ContentDecodingException;
import org.ccnx.ccn.protocol.CCNTime;
Solution content 
import java.util.TreeMap;
import java.util.logging.Level;

import org.ccnx.ccn.impl.CCNNetworkManager;
import org.ccnx.ccn.impl.support.DataUtils;
import org.ccnx.ccn.impl.support.Log;
import org.ccnx.ccn.io.content.ContentDecodingException;
import org.ccnx.ccn.protocol.CCNTime;
File
BinaryXMLDecoder.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
		readStartElement(startTag);
		return readBlob();
	}
<<<<<<< HEAD
		
	public CCNTime readDateTime(String startTag) throws ContentDecodingException {
		byte [] byteTimestamp = readBinaryElement(startTag);
		CCNTime timestamp = new CCNTime(byteTimestamp);
		return timestamp;
=======

	public final byte [] readBlob() throws ContentDecodingException {
		return readBinary(BinaryXMLCodec.XML_BLOB);
>>>>>>> fa001ae3890bb11bf96bd2f412c41dcfc94098f1
	}

	/**
Solution content 
		readStartElement(startTag);
		return readBlob();
	}

	public final byte [] readBlob() throws ContentDecodingException {
		return readBinary(BinaryXMLCodec.XML_BLOB);
	}

	/**
File
BinaryXMLDecoder.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
		byte [] byteTimestamp = readBlob();

		CCNTime timestamp = new CCNTime(byteTimestamp);
<<<<<<< HEAD
=======
		if (null == timestamp) {
			throw new ContentDecodingException("Cannot parse timestamp: " + DataUtils.printHexBytes(byteTimestamp));
		}
>>>>>>> fa001ae3890bb11bf96bd2f412c41dcfc94098f1
		return timestamp;
	}
Solution content 
		byte [] byteTimestamp = readBlob();

		return new CCNTime(byteTimestamp);
	}
File
BinaryXMLDecoder.java
Developer's decision
Manual
Kind of conflict
If statement
Chunk
Conflicting content 
		Assert.assertTrue("Content never seen", sawContent);

		// Make sure that we don't get back content after we cancel the interest
<<<<<<< HEAD
		Interest nextInterest = new Interest(new ContentName(prefix, 
=======
		Interest nextInterest = new Interest(ContentName.fromNative(prefix,
>>>>>>> fa001ae3890bb11bf96bd2f412c41dcfc94098f1
				Integer.toString(counter)));
		getHandle.expressInterest(nextInterest, this);
		sawContent = false;
Solution content 
		Assert.assertTrue("Content never seen", sawContent);

		// Make sure that we don't get back content after we cancel the interest
		Interest nextInterest = new Interest(new ContentName(prefix, 
				Integer.toString(counter)));
		getHandle.expressInterest(nextInterest, this);
		sawContent = false;
File
DeprecatedInterfaceTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		// Now check that we don't see an interest after we unregister its filter
		sawInterest = false;
<<<<<<< HEAD
		nextInterest = new Interest(new ContentName(prefix, Integer.toString(counter)));
=======
		nextInterest = new Interest(ContentName.fromNative(prefix,
				Integer.toString(counter)));
>>>>>>> fa001ae3890bb11bf96bd2f412c41dcfc94098f1
		putHandle.unregisterFilter(prefix, this);
		getHandle.expressInterest(nextInterest, this);
		interestSema.tryAcquire(QUICK_TIMEOUT, TimeUnit.MILLISECONDS);
Solution content 
		// Now check that we don't see an interest after we unregister its filter
		sawInterest = false;
		nextInterest = new Interest(new ContentName(prefix, Integer.toString(counter)));
		putHandle.unregisterFilter(prefix, this);
		getHandle.expressInterest(nextInterest, this);
		interestSema.tryAcquire(QUICK_TIMEOUT, TimeUnit.MILLISECONDS);
File
DeprecatedInterfaceTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		sawInterest = true;
		interestSema.release();
		if (putNow) {
<<<<<<< HEAD
			ContentObject co = ContentObject.buildContentObject(new ContentName(prefix, 
=======
			ContentObject co = ContentObject.buildContentObject(ContentName.fromNative(prefix,
>>>>>>> fa001ae3890bb11bf96bd2f412c41dcfc94098f1
						Integer.toString(counter++)), "deprecationTest".getBytes());
			try {
				putNow = false;
Solution content 
		sawInterest = true;
		interestSema.release();
		if (putNow) {
			ContentObject co = ContentObject.buildContentObject(new ContentName(prefix, 
						Integer.toString(counter++)), "deprecationTest".getBytes());
			try {
				putNow = false;
File
DeprecatedInterfaceTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		CCNTime versionToAdd = new CCNTime();
		for(int i = 0; i < SystemConfiguration.GET_LATEST_VERSION_ATTEMPTS + 5; i++) {
			versionToAdd.increment(1);
<<<<<<< HEAD
			responseObjects.add(ContentObject.buildContentObject(SegmentationProfile.segmentName(new ContentName(baseName, versionToAdd), 0), "here is version generated".getBytes(), null, null, SegmentationProfile.getSegmentNumberNameComponent(0)));
			System.out.println("created version with time: "+versionToAdd+" object name: "+responseObjects.get(i).fullName());
=======
			responseObjects.add(ContentObject.buildContentObject(SegmentationProfile.segmentName(VersioningProfile.addVersion(baseName, versionToAdd), 0), "here is version generated".getBytes(), null, null, SegmentationProfile.getSegmentNumberNameComponent(0)));
			Log.info(Log.FAC_TEST, "created version with time: "+versionToAdd+" object name: "+responseObjects.get(i).fullName());
>>>>>>> fa001ae3890bb11bf96bd2f412c41dcfc94098f1
		}

		lastVersionPublished = responseObjects.get(responseObjects.size()-1);
Solution content 
		CCNTime versionToAdd = new CCNTime();
		for(int i = 0; i < SystemConfiguration.GET_LATEST_VERSION_ATTEMPTS + 5; i++) {
			versionToAdd.increment(1);
			responseObjects.add(ContentObject.buildContentObject(SegmentationProfile.segmentName(new ContentName(baseName, versionToAdd), 0), "here is version generated".getBytes(), null, null, SegmentationProfile.getSegmentNumberNameComponent(0)));
			Log.info(Log.FAC_TEST, "created version with time: "+versionToAdd+" object name: "+responseObjects.get(i).fullName());
		}

		lastVersionPublished = responseObjects.get(responseObjects.size()-1);
File
LatestVersionTest.java
Developer's decision
Combination
Kind of conflict
Method invocation
Chunk
Conflicting content 
			for(int i =0; i < SystemConfiguration.GET_LATEST_VERSION_ATTEMPTS; i++) {
				versionToAdd.increment(1);
<<<<<<< HEAD
				responseObjects.add(ContentObject.buildContentObject(SegmentationProfile.segmentName(new ContentName(baseName, versionToAdd), 0), "here is version generated".getBytes(), null, null, SegmentationProfile.getSegmentNumberNameComponent(0)));
				System.out.println("created version with time: "+versionToAdd+" object name: "+responseObjects.get(i).fullName());
=======
				responseObjects.add(ContentObject.buildContentObject(SegmentationProfile.segmentName(VersioningProfile.addVersion(baseName, versionToAdd), 0), "here is version generated".getBytes(), null, null, SegmentationProfile.getSegmentNumberNameComponent(0)));
				Log.info(Log.FAC_TEST, "created version with time: "+versionToAdd+" object name: "+responseObjects.get(i).fullName());
>>>>>>> fa001ae3890bb11bf96bd2f412c41dcfc94098f1
			}

			lastVersionPublished = responseObjects.get(responseObjects.size()-1);
Solution content 
			for(int i =0; i < SystemConfiguration.GET_LATEST_VERSION_ATTEMPTS; i++) {
				versionToAdd.increment(1);
				responseObjects.add(ContentObject.buildContentObject(SegmentationProfile.segmentName(new ContentName(baseName, versionToAdd), 0), "here is version generated".getBytes(), null, null, SegmentationProfile.getSegmentNumberNameComponent(0)));
				Log.info(Log.FAC_TEST, "created version with time: "+versionToAdd+" object name: "+responseObjects.get(i).fullName());
			}

			lastVersionPublished = responseObjects.get(responseObjects.size()-1);
File
LatestVersionTest.java
Developer's decision
Combination
Kind of conflict
Method invocation
Chunk
Conflicting content 
		failVerify1 = ContentObject.buildContentObject(SegmentationProfile.segmentName(new ContentName(baseName, versionToAdd), 0), "here is failVerify".getBytes(), null, null, SegmentationProfile.getSegmentNumberNameComponent(0));
		responseObjects.add(failVerify1);

<<<<<<< HEAD
		
		failVerify2 = ContentObject.buildContentObject(SegmentationProfile.segmentName(new ContentName(baseName, versionToAdd), 0), "here is a second failVerify".getBytes(), null, null, SegmentationProfile.getSegmentNumberNameComponent(0));
		responseObjects.add(failVerify2);
		
		ContentObject failVerify3 = ContentObject.buildContentObject(SegmentationProfile.segmentName(new ContentName(baseName, versionToAdd), 0), "here is a third, but it should pass".getBytes(), null, null, SegmentationProfile.getSegmentNumberNameComponent(0));
=======

		failVerify2 = ContentObject.buildContentObject(SegmentationProfile.segmentName(VersioningProfile.addVersion(baseName, versionToAdd), 0), "here is a second failVerify".getBytes(), null, null, SegmentationProfile.getSegmentNumberNameComponent(0));
		responseObjects.add(failVerify2);

		ContentObject failVerify3 = ContentObject.buildContentObject(SegmentationProfile.segmentName(VersioningProfile.addVersion(baseName, versionToAdd), 0), "here is a third, but it should pass".getBytes(), null, null, SegmentationProfile.getSegmentNumberNameComponent(0));
>>>>>>> fa001ae3890bb11bf96bd2f412c41dcfc94098f1
		responseObjects.add(failVerify3);

		try {
Solution content 
		failVerify1 = ContentObject.buildContentObject(SegmentationProfile.segmentName(new ContentName(baseName, versionToAdd), 0), "here is failVerify".getBytes(), null, null, SegmentationProfile.getSegmentNumberNameComponent(0));
		responseObjects.add(failVerify1);


		failVerify2 = ContentObject.buildContentObject(SegmentationProfile.segmentName(new ContentName(baseName, versionToAdd), 0), "here is a second failVerify".getBytes(), null, null, SegmentationProfile.getSegmentNumberNameComponent(0));
		responseObjects.add(failVerify2);

		ContentObject failVerify3 = ContentObject.buildContentObject(SegmentationProfile.segmentName(new ContentName(baseName, versionToAdd), 0), "here is a third, but it should pass".getBytes(), null, null, SegmentationProfile.getSegmentNumberNameComponent(0));
		responseObjects.add(failVerify3);

		try {
File
LatestVersionTest.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Variable