diff options
3 files changed, 2 insertions, 13 deletions
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterProvider.java b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterProvider.java index b751d96..1cd583f 100644 --- a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterProvider.java +++ b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterProvider.java @@ -117,7 +117,6 @@ public class DcaeControllerClusterProvider extends BasicAdaptorProvider implemen b = b.replaceFirst("localhost", s.getServer().getNetworks().get(0).getDnsName()); client.setBaseAddress(b); logger.info("using baseAdress: " + client.getBaseAddress()); -// System.out.println("CLUSTER: " + client.getBaseAddress()); return new DcaeControllerClusterConsole(client); } @@ -148,7 +147,6 @@ public class DcaeControllerClusterProvider extends BasicAdaptorProvider implemen @Override public void start() { -// System.out.println("CLUSTER: start"); try { String hostname = SecurityUtils.getHostName(); if (hostname.indexOf(".") > 0) @@ -172,44 +170,34 @@ public class DcaeControllerClusterProvider extends BasicAdaptorProvider implemen } catch (Exception e) { e.printStackTrace(); } -// System.out.println("CLUSTER: start"); Thread t = new Thread("cluster replication") { @Override public void run() { -// System.out.println("CLUSTER 2: run"); while (true) { try { -// System.out.println("CLUSTER 3: run"); for (ControllerClusterServer s : o.getServers()) { if (s.getName().equals(o.getMyServerName())) o.setRole(s.getRole()); } controller.getServer().isSlave = o.getRole() == ServerRole.SLAVE; if (o.getRole() == ServerRole.MASTER) { -// System.out.println("CLUSTER 3: run"); ecomplogger.setOperation(DcaeControllerOperationEnum.CLUSTER_DATA_REPLICATION); ecomplogger.newRequestId(); ecomplogger.setInstanceId(controller, o); ecomplogger.recordAuditEventStart(); for (ControllerClusterServer s : o.getServers()) { -// System.out.println("CLUSTER 4: run: " + s.getName() + " " + s.getRole()); if (s.getRole() != ServerRole.SLAVE) continue; if (s.getName().equals(o.getMyServerName())) continue; -// System.out.println("CLUSTER 5: run"); for (ControllerClusterServerData d : s.getData()) { try { -// System.out.println("CLUSTER 6: run: " + d.getName()); Date last = d.getLastPush() == null ? null : d.getLastPush().last; long i = DateUtils.stringToDuration(d.getPushInterval()); -// System.out.println("CLUSTER 7: run"); long now = new Date().getTime(); if (last != null && last.getTime() + i > now) continue; -// System.out.println("CLUSTER 8: run"); o.pushData(s.getName(), d.getName()); -// System.out.println("CLUSTER 9: run"); } catch (Exception e) { ecomplogger.warn(DcaeControllerMessageEnum.CLUSTER_DATA_REPLICATION_FAILED, s.getName()); diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerProvider.java b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerProvider.java index 79b26f2..598efae 100644 --- a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerProvider.java +++ b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerProvider.java @@ -1028,6 +1028,7 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro continue; a.put(c1); } + break; default: throw new RuntimeException("Unknown Policy match type: " + matchingType); } diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryProvider.java b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryProvider.java index 5165653..19a42e0 100644 --- a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryProvider.java +++ b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryProvider.java @@ -168,7 +168,7 @@ public class DcaeDcaeInventoryProvider extends BasicAdaptorProvider { for (Iterator<String> iterator = o.keys(); iterator.hasNext();) { String key = (String) iterator.next(); Object o1 = o.get(key); - if (o1.equals(null)) { + if (o1 == null) { delete.add(key); continue; } |