Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openbis
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sispub
openbis
Commits
b204992d
Commit
b204992d
authored
14 years ago
by
tpylak
Browse files
Options
Downloads
Patches
Plain Diff
LMS-1511 minor: better names
SVN: 15800
parent
a0f03568
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
common/source/java/ch/systemsx/cisd/common/io/ConcatenatedFileOutputStreamWriter.java
+7
-7
7 additions, 7 deletions
...sx/cisd/common/io/ConcatenatedFileOutputStreamWriter.java
with
7 additions
and
7 deletions
common/source/java/ch/systemsx/cisd/common/io/ConcatenatedFileOutputStreamWriter.java
+
7
−
7
View file @
b204992d
...
...
@@ -56,12 +56,12 @@ public class ConcatenatedFileOutputStreamWriter
}
/**
* Copies the next block into the specified output stream. Returns the number of bytes
copied or
* -1 if there are no more blocks to read.
* Copies the next block into the specified output stream. Returns the number of bytes
written
*
or
-1 if there are no more blocks to read.
*/
public
long
writeNextBlock
(
OutputStream
output
)
throws
IOException
{
long
blockSize
=
goto
NextBlock
();
long
blockSize
=
beginReading
NextBlock
();
if
(
blockSize
==
-
1
)
{
return
-
1
;
// no more blocks
...
...
@@ -83,13 +83,13 @@ public class ConcatenatedFileOutputStreamWriter
}
/**
* block size if there is a next block in the stream and it is non-empty. Returns 0 if the
blockminor: remove trash
* is empty, -1 if there are no more blocks to read.<br>
* block size if there is a next block in the stream and it is non-empty. Returns 0 if the
*
blockminor: remove trash
is empty, -1 if there are no more blocks to read.<br>
* Can be called only at the beginning or if the end of the previous block has been reached.
*
* @throws IOException when the stream is corrupted and the size of the block cannot be read
*/
private
long
goto
NextBlock
()
throws
IOException
private
long
beginReading
NextBlock
()
throws
IOException
{
if
(
bytesToReadFromCurrent
>
0
)
{
...
...
@@ -122,7 +122,7 @@ public class ConcatenatedFileOutputStreamWriter
/**
* Reads the bytes from the current block. If len is 0 returns 0, otherwise if the end of one
* block has been reached returns -1. It does not mean that the end of the whole stream has been
* reached, the stream may contain other blocks. The method {@link #
goto
NextBlock()} should be
* reached, the stream may contain other blocks. The method {@link #
beginReading
NextBlock()} should be
* called to start reading the next block.<br>
* See {@link InputStream#read(byte[], int, int)} for parameters details.
*/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment