Projects >> server >>1f5c0175e6fbd2c881ce8e6b107f1c148f12c7fb

Chunk
Conflicting content 
			else if(url != null) {
				try {
					// HT: set inputStream
<<<<<<< HEAD
					inputStream = url.openStream();
=======
					// inputStream = url.openStream();
					inputStream = new FileInputStream(url.getPath());
					LOGGER.debug("HT: creating an input stream from url: " + inputStream.toString());
>>>>>>> 3d4e0187ea8b6aeff77a269f0b7c913997be5f96
					return inputStream;
				}
				catch(IOException e) {
Solution content 
			else if(url != null) {
				try {
					// HT: set inputStream
					// inputStream = url.openStream();
					inputStream = new FileInputStream(url.getPath());
					LOGGER.debug("HT: creating an input stream from url: " + inputStream.toString());
					return inputStream;
				}
				catch(IOException e) {
File
Image.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
			
			try {
				if(inputStream != null) {
<<<<<<< HEAD
					LOGGER.debug("Closing input stream");
=======
					LOGGER.info("Closing input stream: " + inputStream.toString());
>>>>>>> 3d4e0187ea8b6aeff77a269f0b7c913997be5f96
					inputStream.close();
				}
				bufferedImage = null;
Solution content 
			
			try {
				if(inputStream != null) {
					LOGGER.info("Closing input stream: " + inputStream.toString());
					inputStream.close();
				}
				bufferedImage = null;
File
Image.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
	public void closeImageStreams() {
		try { 
			for (Size size : imageData.keySet()) {
<<<<<<< HEAD
				LOGGER.debug("About to close Inputstream: " + size.toString());
=======
				LOGGER.info("HT: Closing Inputstream: " + size.toString());
>>>>>>> 3d4e0187ea8b6aeff77a269f0b7c913997be5f96
				imageData.get(size).closeInputStream();
			}
		} catch (DomainException e){
Solution content 
	public void closeImageStreams() {
		try { 
			for (Size size : imageData.keySet()) {
				LOGGER.info("HT: Closing Inputstream: " + size.toString());
				imageData.get(size).closeInputStream();
			}
		} catch (DomainException e){
File
Image.java
Developer's decision
Version 2
Kind of conflict
Method invocation