Toggle navigation
Toggle navigation
This project
Loading...
Sign in
홍길동
/
onos
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
Sho SHIMIZU
2016-09-07 10:29:01 -0700
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
3f7513ef155ba22f44491bb73d284c5476c1cea2
3f7513ef
1 parent
f752afc1
Provide hasFailed explicitly
Change-Id: I3bacbbfcc84259b8bb6904d21b45a1e9e9e60e7a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
View file @
3f7513e
...
...
@@ -591,11 +591,11 @@ public class FlowRuleManager
this
.
pendingDevices
=
new
HashSet
<>();
}
FlowOperationsProcessor
(
FlowOperationsProcessor
src
)
{
FlowOperationsProcessor
(
FlowOperationsProcessor
src
,
boolean
hasFailed
)
{
this
.
fops
=
src
.
fops
;
this
.
stages
=
Lists
.
newArrayList
(
src
.
stages
);
this
.
pendingDevices
=
new
HashSet
<>(
src
.
pendingDevices
);
this
.
hasFailed
=
src
.
hasFailed
;
this
.
hasFailed
=
hasFailed
;
}
@Override
...
...
@@ -628,15 +628,14 @@ public class FlowRuleManager
synchronized
void
satisfy
(
DeviceId
devId
)
{
pendingDevices
.
remove
(
devId
);
if
(
pendingDevices
.
isEmpty
())
{
operationsService
.
execute
(
new
FlowOperationsProcessor
(
this
));
operationsService
.
execute
(
new
FlowOperationsProcessor
(
this
,
hasFailed
));
}
}
synchronized
void
fail
(
DeviceId
devId
,
Set
<?
extends
FlowRule
>
failures
)
{
hasFailed
=
true
;
pendingDevices
.
remove
(
devId
);
if
(
pendingDevices
.
isEmpty
())
{
operationsService
.
execute
(
new
FlowOperationsProcessor
(
this
));
operationsService
.
execute
(
new
FlowOperationsProcessor
(
this
,
true
));
}
FlowRuleOperations
.
Builder
failedOpsBuilder
=
FlowRuleOperations
.
builder
();
...
...
Please
register
or
login
to post a comment