Merge pull request #140 from secondsun/startup_optimizations

secondsun · web-flow · commit f7d535b5a39a · 2021-03-17T10:52:42.000-04:00
fix: minor typo causing an NPE
diff --git a/source/rhoas/src/main/java/com/openshift/cloud/controllers/AbstractCloudServicesController.java b/source/rhoas/src/main/java/com/openshift/cloud/controllers/AbstractCloudServicesController.java
@@ -68,7 +68,7 @@ private boolean shouldProcess(T resource) {
 
     List<KafkaCondition> conditions = getConditions(resource);
 
-    if (conditions == null | conditions.isEmpty()) {
+    if (conditions == null || conditions.isEmpty()) {
       return true;
     }
 
@@ -80,13 +80,11 @@ private boolean shouldProcess(T resource) {
     }
 
     if (Status.True.equals(finishedCondition.getStatus())) {
-      //everything is up to date and the resource had finished, then skip
+      // everything is up to date and the resource had finished, then skip
       return false;
     } else {
       return true;
     }
-
-    
   }
 
   private List<KafkaCondition> getConditions(T resource) {

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ private boolean shouldProcess(T resource) {`
`68`	`68`
`69`	`69`	`List<KafkaCondition> conditions = getConditions(resource);`
`70`	`70`
`71`		`- if (conditions == null \| conditions.isEmpty()) {`
	`71`	`+ if (conditions == null \|\| conditions.isEmpty()) {`
`72`	`72`	`return true;`
`73`	`73`	`}`
`74`	`74`
`@@ -80,13 +80,11 @@ private boolean shouldProcess(T resource) {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`if (Status.True.equals(finishedCondition.getStatus())) {`
`83`		`- //everything is up to date and the resource had finished, then skip`
	`83`	`+ // everything is up to date and the resource had finished, then skip`
`84`	`84`	`return false;`
`85`	`85`	`} else {`
`86`	`86`	`return true;`
`87`	`87`	`}`
`88`		`-`
`89`		`-`
`90`	`88`	`}`
`91`	`89`
`92`	`90`	`private List<KafkaCondition> getConditions(T resource) {`