Projects >> zanata-server >>6da25d440678948fc62234cd7017d4bf80bcb874

Chunk
Conflicting content 
         try
         {
            tempFileStream = new FileInputStream(tempFile);
<<<<<<< HEAD
            LobHelper lobHelper = documentDAO.getLobHelper();
            Blob fileContents = lobHelper.createBlob(tempFileStream, (int) tempFile.length());
            rawDocument.setContent(fileContents);
            documentDAO.addRawDocument(document, rawDocument);
            documentDAO.flush();
=======
            try
            {
               FileService.virusScan(tempFile);
               Blob fileContents = Hibernate.createBlob(tempFileStream, (int) tempFile.length());
               rawDocument.setContent(fileContents);
               documentDAO.addRawDocument(document, rawDocument);
               documentDAO.flush();
            }
            catch (VirusDetectedException e)
            {
               log.warn("File failed virus scan: {}", e.getMessage());
               FacesMessages.instance().add(Severity.ERROR, "uploaded file did not pass virus scan");
            }

>>>>>>> 5f96797e6b1986ea44ecde8f1f56d9296450bfce
         }
         catch (FileNotFoundException e)
         {
Solution content 
         try
         {
            tempFileStream = new FileInputStream(tempFile);
            try
            {
               FileService.virusScan(tempFile);
               Blob fileContents = documentDAO.getLobHelper().createBlob(tempFileStream, (int) tempFile.length());
               rawDocument.setContent(fileContents);
               documentDAO.addRawDocument(document, rawDocument);
               documentDAO.flush();
            }
            catch (VirusDetectedException e)
            {
               log.warn("File failed virus scan: {}", e.getMessage());
               FacesMessages.instance().add(Severity.ERROR, "uploaded file did not pass virus scan");
            }

         }
         catch (FileNotFoundException e)
         {
File
ProjectIterationFilesAction.java
Developer's decision
Manual
Kind of conflict
Method invocation
Try statement
Variable
Chunk
Conflicting content 
      return rawDoc;
   }

<<<<<<< HEAD
   public LobHelper getLobHelper()
   {
      return getSession().getLobHelper();
=======
   public List getDocumentsByIds(List docIds)
   {
      StringBuilder query = new StringBuilder();
      query.append("from HDocument doc where doc.id in (:docIds)");
      
      Query q = getSession().createQuery(query.toString());
      q.setParameterList("docIds", docIds);
      q.setCacheable(true);
      q.setComment("DocumentDAO.getDocumentsByIds");
      
      List docs = q.list();
      
      return docs;
>>>>>>> 5f96797e6b1986ea44ecde8f1f56d9296450bfce
   }
}
Solution content 
      return rawDoc;
   }

   public List getDocumentsByIds(List docIds)
   {
      StringBuilder query = new StringBuilder();
      query.append("from HDocument doc where doc.id in (:docIds)");
      
      Query q = getSession().createQuery(query.toString());
      q.setParameterList("docIds", docIds);
      q.setCacheable(true);
      q.setComment("DocumentDAO.getDocumentsByIds");
      
      List docs = q.list();
      
      return docs;
   }

   public LobHelper getLobHelper()
   {
      return getSession().getLobHelper();
   }
}
File
DocumentDAO.java
Developer's decision
Concatenation
Kind of conflict
Method invocation
Method signature
Return statement
Variable