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
343cadfb
Commit
343cadfb
authored
16 years ago
by
ribeaudc
Browse files
Options
Downloads
Patches
Plain Diff
minor: - final keyword added when possible.
SVN: 6167
parent
7ecaa19b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
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/process/ProcessResult.java
+9
-9
9 additions, 9 deletions
...e/java/ch/systemsx/cisd/common/process/ProcessResult.java
with
9 additions
and
9 deletions
common/source/java/ch/systemsx/cisd/common/process/ProcessResult.java
+
9
−
9
View file @
343cadfb
...
@@ -46,28 +46,28 @@ public final class ProcessResult
...
@@ -46,28 +46,28 @@ public final class ProcessResult
private
List
<
String
>
outputLines
;
private
List
<
String
>
outputLines
;
// process finished or was terminated after timeout
// process finished or was terminated after timeout
public
static
ProcessResult
create
(
Process
process
,
List
<
String
>
commandLine
,
public
static
ProcessResult
create
(
final
Process
process
,
final
List
<
String
>
commandLine
,
Logger
operationLog
,
Logger
machineLog
)
final
Logger
operationLog
,
final
Logger
machineLog
)
{
{
return
new
ProcessResult
(
process
,
false
,
commandLine
,
operationLog
,
machineLog
);
return
new
ProcessResult
(
process
,
false
,
commandLine
,
operationLog
,
machineLog
);
}
}
// process could not start at all
// process could not start at all
public
static
ProcessResult
createNotStarted
(
List
<
String
>
commandLine
,
Logger
operationLog
,
public
static
ProcessResult
createNotStarted
(
final
List
<
String
>
commandLine
,
Logger
machineLog
)
final
Logger
operationLog
,
final
Logger
machineLog
)
{
{
return
new
ProcessResult
(
null
,
false
,
commandLine
,
operationLog
,
machineLog
);
return
new
ProcessResult
(
null
,
false
,
commandLine
,
operationLog
,
machineLog
);
}
}
// process started, but was blocked and could not be terminated, so we stopped waiting for it
// process started, but was blocked and could not be terminated, so we stopped waiting for it
public
static
ProcessResult
createWaitingInterrupted
(
Process
process
,
List
<
String
>
commandLine
,
public
static
ProcessResult
createWaitingInterrupted
(
final
Process
process
,
Logger
operationLog
,
Logger
machineLog
)
final
List
<
String
>
commandLine
,
final
Logger
operationLog
,
final
Logger
machineLog
)
{
{
return
new
ProcessResult
(
process
,
true
,
commandLine
,
operationLog
,
machineLog
);
return
new
ProcessResult
(
process
,
true
,
commandLine
,
operationLog
,
machineLog
);
}
}
private
ProcessResult
(
Process
processOrNull
,
boolean
hasBlocked
,
List
<
String
>
commandLine
,
private
ProcessResult
(
final
Process
processOrNull
,
final
boolean
hasBlocked
,
Logger
operationLog
,
Logger
machineLog
)
final
List
<
String
>
commandLine
,
final
Logger
operationLog
,
final
Logger
machineLog
)
{
{
this
.
commandLine
=
commandLine
;
this
.
commandLine
=
commandLine
;
this
.
commandName
=
new
File
(
commandLine
.
get
(
0
)).
getName
();
this
.
commandName
=
new
File
(
commandLine
.
get
(
0
)).
getName
();
...
@@ -209,7 +209,7 @@ public final class ProcessResult
...
@@ -209,7 +209,7 @@ public final class ProcessResult
return
;
return
;
}
}
machineLog
.
log
(
logLevel
,
String
.
format
(
"[%s] output:"
,
commandName
));
machineLog
.
log
(
logLevel
,
String
.
format
(
"[%s] output:"
,
commandName
));
for
(
String
ln
:
processOutputLines
)
for
(
final
String
ln
:
processOutputLines
)
{
{
if
(
ln
.
trim
().
length
()
>
0
)
if
(
ln
.
trim
().
length
()
>
0
)
{
{
...
...
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