Projects >> cloudname >>96a4a112aa84a124a93d48e3e6b384a9bff24d3e

Chunk
Conflicting content 
                Coordinate c = Coordinate.parse(coordinateFlag);
                ServiceStatus status;

<<<<<<< HEAD
                status = cloudname.getStatus(c);
=======
                try {
                    status = cloudname.getStatus(c);
                } catch (CloudnameException e) {
                    System.err.println("Problems loading status, is service running? Error:\n" + e.getMessage());
                    break;
                }
>>>>>>> 95e9be7ab91374af39497f5649cedc80bfb05516

                System.err.println("Status:\n" + status.getState().toString() + " " + status.getMessage());
                List endpoints = null;
Solution content 
                Coordinate c = Coordinate.parse(coordinateFlag);
                ServiceStatus status;

                try {
                    status = cloudname.getStatus(c);
                } catch (CloudnameException e) {
                    System.err.println("Problems loading status, is service running? Error:\n" + e.getMessage());
                    break;
                }

                System.err.println("Status:\n" + status.getState().toString() + " " + status.getMessage());
                List endpoints = null;
File
ZkTool.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Try statement
Variable