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
Thomas Vachuska
2014-11-10 20:05:13 -0800
Browse Files
Options
Browse Files
Download
Plain Diff
Committed by
Gerrit Code Review
2014-11-10 20:05:13 -0800
Commit
26837614163a7c97141d54968a366434f051a8da
26837614
2 parents
0538784e
56531510
Merge "Refactor: Improve null safety and simplify branch conditioin"
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
core/net/src/main/java/org/onlab/onos/net/intent/impl/ConnectivityIntentCompiler.java
core/net/src/main/java/org/onlab/onos/net/intent/impl/ConnectivityIntentCompiler.java
View file @
2683761
...
...
@@ -15,6 +15,7 @@
*/
package
org
.
onlab
.
onos
.
net
.
intent
.
impl
;
import
com.google.common.collect.ImmutableList
;
import
org.apache.felix.scr.annotations.Component
;
import
org.apache.felix.scr.annotations.Reference
;
import
org.apache.felix.scr.annotations.ReferenceCardinality
;
...
...
@@ -30,6 +31,7 @@ import org.onlab.onos.net.topology.LinkWeight;
import
org.onlab.onos.net.topology.PathService
;
import
org.onlab.onos.net.topology.TopologyEdge
;
import
java.util.Collections
;
import
java.util.Iterator
;
import
java.util.List
;
import
java.util.Set
;
...
...
@@ -113,12 +115,16 @@ public abstract class ConnectivityIntentCompiler<T extends ConnectivityIntent>
* @param constraints path constraints
*/
ConstraintBasedLinkWeight
(
List
<
Constraint
>
constraints
)
{
this
.
constraints
=
constraints
;
if
(
constraints
==
null
)
{
this
.
constraints
=
Collections
.
emptyList
();
}
else
{
this
.
constraints
=
ImmutableList
.
copyOf
(
constraints
);
}
}
@Override
public
double
weight
(
TopologyEdge
edge
)
{
if
(
constraints
==
null
||
!
constraints
.
iterator
().
hasNext
())
{
if
(!
constraints
.
iterator
().
hasNext
())
{
return
1.0
;
}
...
...
Please
register
or
login
to post a comment