Committed by
Gerrit Code Review
Revert changes in 8117f36b, which modifies the default behavior
If no command line option regarding lambda is supplied, optical links need to be execluded, but the previous patch broke it. Change-Id: Ia95e82f7c31fdb16345eb43f1864b58aa4f25acc
Showing
1 changed file
with
2 additions
and
3 deletions
... | @@ -115,7 +115,7 @@ public abstract class ConnectivityIntentCommand extends AbstractShellCommand { | ... | @@ -115,7 +115,7 @@ public abstract class ConnectivityIntentCommand extends AbstractShellCommand { |
115 | 115 | ||
116 | @Option(name = "-l", aliases = "--lambda", description = "Lambda", | 116 | @Option(name = "-l", aliases = "--lambda", description = "Lambda", |
117 | required = false, multiValued = false) | 117 | required = false, multiValued = false) |
118 | - private Boolean lambda = null; | 118 | + private boolean lambda = false; |
119 | 119 | ||
120 | @Option(name = "-a", aliases = "--appId", description = "Application Id", | 120 | @Option(name = "-a", aliases = "--appId", description = "Application Id", |
121 | required = false, multiValued = false) | 121 | required = false, multiValued = false) |
... | @@ -313,12 +313,11 @@ public abstract class ConnectivityIntentCommand extends AbstractShellCommand { | ... | @@ -313,12 +313,11 @@ public abstract class ConnectivityIntentCommand extends AbstractShellCommand { |
313 | } | 313 | } |
314 | 314 | ||
315 | // Check for a lambda specification | 315 | // Check for a lambda specification |
316 | - if (lambda != null) { | ||
317 | if (lambda) { | 316 | if (lambda) { |
318 | constraints.add(new LambdaConstraint(null)); | 317 | constraints.add(new LambdaConstraint(null)); |
319 | } | 318 | } |
320 | constraints.add(new LinkTypeConstraint(lambda, Link.Type.OPTICAL)); | 319 | constraints.add(new LinkTypeConstraint(lambda, Link.Type.OPTICAL)); |
321 | - } | 320 | + |
322 | return constraints; | 321 | return constraints; |
323 | } | 322 | } |
324 | 323 | ... | ... |
-
Please register or login to post a comment