홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
HIGUCHI Yuta
Committed by Yuta HIGUCHI
4ea4e42e 1 parent 3289fbf0

Should compere scheme. 

- Bugfix for bug introduced in bugfix for ONOS-3509

Change-Id: I459112483e22c0493bf9c628a0540036f8ee779b
Inline Side-by-side
Showing 4 changed files with 6 additions and 6 deletions
...@@ -288,7 +288,7 @@ public class ECDeviceStore ...@@ -288,7 +288,7 @@ public class ECDeviceStore
288 } else { 288 } else {
289 // Only forward for ConfigProvider 289 // Only forward for ConfigProvider
290 // Forwarding was added as a workaround for ONOS-490 290 // Forwarding was added as a workaround for ONOS-490
291 - if (!providerId.equals("cfg")) { 291 + if (!providerId.scheme().equals("cfg")) {
292 return null; 292 return null;
293 } 293 }
294 DeviceInjectedEvent deviceInjectedEvent = new DeviceInjectedEvent(providerId, deviceId, deviceDescription); 294 DeviceInjectedEvent deviceInjectedEvent = new DeviceInjectedEvent(providerId, deviceId, deviceDescription);
...@@ -420,7 +420,7 @@ public class ECDeviceStore ...@@ -420,7 +420,7 @@ public class ECDeviceStore
420 } else { 420 } else {
421 // Only forward for ConfigProvider 421 // Only forward for ConfigProvider
422 // Forwarding was added as a workaround for ONOS-490 422 // Forwarding was added as a workaround for ONOS-490
423 - if (!providerId.equals("cfg")) { 423 + if (!providerId.scheme().equals("cfg")) {
424 return null; 424 return null;
425 } 425 }
426 if (master == null) { 426 if (master == null) {
......
...@@ -332,7 +332,7 @@ public class GossipDeviceStore ...@@ -332,7 +332,7 @@ public class GossipDeviceStore
332 } else { 332 } else {
333 // Only forward for ConfigProvider 333 // Only forward for ConfigProvider
334 // Forwarding was added as a workaround for ONOS-490 334 // Forwarding was added as a workaround for ONOS-490
335 - if (!providerId.equals("cfg")) { 335 + if (!providerId.scheme().equals("cfg")) {
336 return null; 336 return null;
337 } 337 }
338 // FIXME Temporary hack for NPE (ONOS-1171). 338 // FIXME Temporary hack for NPE (ONOS-1171).
...@@ -585,7 +585,7 @@ public class GossipDeviceStore ...@@ -585,7 +585,7 @@ public class GossipDeviceStore
585 } else { 585 } else {
586 // Only forward for ConfigProvider 586 // Only forward for ConfigProvider
587 // Forwarding was added as a workaround for ONOS-490 587 // Forwarding was added as a workaround for ONOS-490
588 - if (!providerId.equals("cfg")) { 588 + if (!providerId.scheme().equals("cfg")) {
589 return null; 589 return null;
590 } 590 }
591 // FIXME Temporary hack for NPE (ONOS-1171). 591 // FIXME Temporary hack for NPE (ONOS-1171).
......
...@@ -220,7 +220,7 @@ public class ECLinkStore ...@@ -220,7 +220,7 @@ public class ECLinkStore
220 } else { 220 } else {
221 // Only forward for ConfigProvider 221 // Only forward for ConfigProvider
222 // Forwarding was added as a workaround for ONOS-490 222 // Forwarding was added as a workaround for ONOS-490
223 - if (!providerId.equals("cfg")) { 223 + if (!providerId.scheme().equals("cfg")) {
224 return null; 224 return null;
225 } 225 }
226 // Temporary hack for NPE (ONOS-1171). 226 // Temporary hack for NPE (ONOS-1171).
......
...@@ -325,7 +325,7 @@ public class GossipLinkStore ...@@ -325,7 +325,7 @@ public class GossipLinkStore
325 } else { 325 } else {
326 // Only forward for ConfigProvider 326 // Only forward for ConfigProvider
327 // Forwarding was added as a workaround for ONOS-490 327 // Forwarding was added as a workaround for ONOS-490
328 - if (!providerId.equals("cfg")) { 328 + if (!providerId.scheme().equals("cfg")) {
329 return null; 329 return null;
330 } 330 }
331 // FIXME Temporary hack for NPE (ONOS-1171). 331 // FIXME Temporary hack for NPE (ONOS-1171).
......