Projects >> nuxeo-core >>b2045650b65a96c5d26279c1ccfd2369a01b4443

Chunk
Conflicting content 
 * content instead of returning the content bytes.
 * 

 * The same is true when setting the content for a document: you set a content
<<<<<<< HEAD
 * source and not directly the content bytes. Ex: 
 * File file = new File("/tmp/index.html");
=======
 * source and not directly the content bytes. Ex:
 * 
 * File file = new File("/tmp/index.html");
>>>>>>> 09438786a3a7d34267fc69e57ca6485e0816f832
 * FileBlob fb = new FileBlob(file);
 * fb.setContentType("text/html");
 * fb.setEncoding("UTF-8"); // this specifies that content bytes will be stored as UTF-8
Solution content 
 * source and not directly the content bytes. Ex:
 * 
 * content instead of returning the content bytes.
 * 

 * The same is true when setting the content for a document: you set a content
 * File file = new File("/tmp/index.html");
 * FileBlob fb = new FileBlob(file);
File
Blob.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
 * htmlDoc = blob.getString(); // the content is decoded from UTF-8 into a java string
 *
* <<<<<<< HEAD * @author Bogdan Stefanescu * ======= * @author Bogdan Stefanescu >>>>>>> 09438786a3a7d34267fc69e57ca6485e0816f832 */ public interface Blob {
Solution content 
 * htmlDoc = blob.getString(); // the content is decoded from UTF-8 into a java string
 *
* * @author Bogdan Stefanescu */ public interface Blob {
File
Blob.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
    /**
     * Persist this stream so that getStream() method can be called successfully
     * several times. The persistence is done in a temp file or in memory - this
<<<<<<< HEAD
     * is up to the implemention.
     * 

     * Blobs that are already persistent return themselves.
     *
     * 

     * Persistence should update the internal structure of the Blob to make it
     * persistent whenever possible and hence return itself whenever possible.
     * This behavior cannot be guaranteed by every implementation however.
=======
     * is up to the implementation.
     * 

     * Blobs that are already persistent return themselves.
>>>>>>> 09438786a3a7d34267fc69e57ca6485e0816f832
     *
     * @return a persistent version of the blob
     * @throws IOException
Solution content 
    /**
     * Persist this stream so that getStream() method can be called successfully
     * several times. The persistence is done in a temp file or in memory - this
     * is up to the implemention.
     * 

     * Blobs that are already persistent return themselves.
     *
     * 

     * Persistence should update the internal structure of the Blob to make it
     * persistent whenever possible and hence return itself whenever possible.
     * This behavior cannot be guaranteed by every implementation however.
     *
     * @return a persistent version of the blob
     * @throws IOException
File
Blob.java
Developer's decision
Version 1
Kind of conflict
Comment