Projects >> Pregel >>f73071115cf0c5c10a70c0030f9ef9246d68b15b

Chunk
Conflicting content 
	 * @throws RemoteException the remote exception
	 */
	public void addRecoveredData(Partition partition, Map> messages) throws RemoteException;
<<<<<<< HEAD

	public void shutdown() throws RemoteException;
=======
	
	/**
	 * Write output.
	 *
	 * @param outputFilePath the output file path
	 * @throws RemoteException the remote exception
	 */
	public void writeOutput(String outputFilePath) throws RemoteException;
>>>>>>> a70f236def46b4c132e691cb65989cb73f688f99
}
Solution content 
	 * @throws RemoteException the remote exception
	 */
	public void addRecoveredData(Partition partition, Map> messages) throws RemoteException;
	
	/**
	 * Method to shutdown the worker machine
	 * @throws RemoteException
	 */
	public void shutdown() throws RemoteException;
	
	/**
	 * Write output.
	 *
	 * @param outputFilePath the output file path
	 * @throws RemoteException the remote exception
	 */
	public void writeOutput(String outputFilePath) throws RemoteException;

}
File
Worker.java
Developer's decision
Manual
Kind of conflict
Comment
Method interface
Chunk
Conflicting content 
	}

	@Override
<<<<<<< HEAD
	public void shutdown() throws RemoteException {
			java.util.Date date = new java.util.Date();
			System.out.println("Worker" + workerID + " goes down now at :"
					+ new Timestamp(date.getTime()));
			System.exit(0);
=======
	public void writeOutput(String outputFilePath) throws RemoteException{
		System.out.println("Printing the final state of the partitions");		
		Iterator iter = nextPartitionQueue.iterator();
		// Append the appropriate content to the output file.
		StringBuilder contents = new StringBuilder();
		while(iter.hasNext()){
			contents.append(iter.next());			
		}
		GeneralUtils.writeToFile(outputFilePath, contents.toString(), true);
>>>>>>> a70f236def46b4c132e691cb65989cb73f688f99
	}
}
Solution content 
	}

	/**
	 * Shutdown the worker machine
	 */
	@Override
	public void shutdown() throws RemoteException {
			java.util.Date date = new java.util.Date();
			System.out.println("Worker" + workerID + " goes down now at :"
					+ new Timestamp(date.getTime()));
			System.exit(0);
	}
	
	public void writeOutput(String outputFilePath) throws RemoteException{
		System.out.println("Printing the final state of the partitions");		
		Iterator iter = nextPartitionQueue.iterator();
		// Append the appropriate content to the output file.
		StringBuilder contents = new StringBuilder();
		while(iter.hasNext()){
			contents.append(iter.next());			
		}
		GeneralUtils.writeToFile(outputFilePath, contents.toString(), true);
	}
}
File
WorkerImpl.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Method signature
Variable
While statement
Chunk
Conflicting content 
		this.totalPartitions += 1;
		this.worker.addRecoveredData(partition, messages);
	}
<<<<<<< HEAD

	public void shutdown() {	
		try {
			worker.shutdown();
		} catch (RemoteException e) {
			this.exit();
		}
=======
	
	/**
	 * Write output.
	 *
	 * @param outputFilePath the output file path
	 * @throws RemoteException the remote exception
	 */
	public void writeOutput(String outputFilePath) throws RemoteException{
		this.worker.writeOutput(outputFilePath);
>>>>>>> a70f236def46b4c132e691cb65989cb73f688f99
	}
}
Solution content 
		this.totalPartitions += 1;
		this.worker.addRecoveredData(partition, messages);
	}
	
	/**
	 * Shutdowns the worker and exits
	 */
	public void shutdown() {
		try {
			worker.shutdown();
		} catch (RemoteException e) {
			this.exit();
		}
	}

	/**
	 * Write output.
	 * 
	 * @param outputFilePath
	 *            the output file path
	 * @throws RemoteException
	 *             the remote exception
	 */
	public void writeOutput(String outputFilePath) throws RemoteException {
		this.worker.writeOutput(outputFilePath);
	}
}
File
WorkerProxy.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Method signature
Try statement