Projects >> droid >>03aa4ad1ac6a07dd9258b2a39b24dc1a181f938c

Chunk
Conflicting content 
        RequestIdentifier identifier = new RequestIdentifier(uri);
        identifier.setParentResourceId(parentId);
        identifier.setResourceId(nodeId);
<<<<<<< HEAD


        //TODO: must stop factories opening the request.  Important to be able to get a request
        //      object to carry the id, even if it subsequently fails opening it.  This is
        //      handled differently by result handlers (insert vs. update).

        //TODO: this assumes you can handle an error *after* you have already submitted the file
        //      for processing.  This works with the hibernate style entity manager, which will
        //      update the entity if its properties change subsequently.  It's problematic if
        //      we're using a more traditional database system. OR - we need to have an update
        //      mechanism for errors, which updates an existing node status when an error occurs.
=======
        IdentificationRequest request = requestFactory.newRequest(metaData, identifier);
>>>>>>> 8ee9eaace60c558ac96b8356e686752f4d13b4ea
        try {
            request.open(file);
            droidCore.submit(request);
Solution content 
        RequestIdentifier identifier = new RequestIdentifier(uri);
        identifier.setParentResourceId(parentId);
        identifier.setResourceId(nodeId);
        IdentificationRequest request = requestFactory.newRequest(metaData, identifier);
        try {
            request.open(file);
            droidCore.submit(request);
File
FileEventHandler.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
            } else {
                log.warn(String.format("File not found: [%s]", file.getAbsolutePath()));
            }
<<<<<<< HEAD
            //TODO: ugly to create a new request when the factory fails to open it for error reporting.
            //      and will miss any id assigned to the request if saved.
            final FileSystemIdentificationRequest request = new FileSystemIdentificationRequest(metaData, identifier);
=======
>>>>>>> 8ee9eaace60c558ac96b8356e686752f4d13b4ea
            resultHandler.handleError(new IdentificationException(request, error, e));
        } catch (InterruptedException e) {
            log.debug("Interrupted while throttle active.", e);
Solution content 
            } else {
                log.warn(String.format("File not found: [%s]", file.getAbsolutePath()));
            }
            resultHandler.handleError(new IdentificationException(request, error, e));
        } catch (InterruptedException e) {
            log.debug("Interrupted while throttle active.", e);
File
FileEventHandler.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Variable