Projects >> meresco-triplestore >>c80e9d827d4c3b865abdb9609d051b9697674c99

Chunk
Conflicting content 
                String response = Utils.getStackTrace(e);
                _writeResponse(response, outputStream);
                return;
<<<<<<< HEAD
            } catch (Error e) {
            	exchange.sendResponseHeaders(500, 0);
            	_writeResponse(e.getMessage(), outputStream);
            	throw e;
=======
>>>>>>> 3583aca38eac3e2272c0c10e5c6db63e733cb38f
            }
            exchange.sendResponseHeaders(200, 0);
        } finally {
Solution content 
                String response = Utils.getStackTrace(e);
                _writeResponse(response, outputStream);
                return;
            } catch (Error e) {
            	exchange.sendResponseHeaders(500, 0);
            	_writeResponse(e.getMessage(), outputStream);
            	throw e;
            }
            exchange.sendResponseHeaders(200, 0);
        } finally {
File
OwlimHttpHandler.java
Developer's decision
Version 1
Kind of conflict
Catch clause
Method invocation
Throw statement