0005934: Getting null pointer from Column.java in new method anyPlatf…

…ormColumnTypeContains on platformColumns
JumpMind · Jul 25, 2023 · 6b1ee1e · 6b1ee1e
1 parent bf49306
commit 6b1ee1e
Showing 1 changed file with 20 additions and 12 deletions.
diff --git a/symmetric-db/src/main/java/org/jumpmind/db/model/Column.java b/symmetric-db/src/main/java/org/jumpmind/db/model/Column.java
@@ -622,36 +622,44 @@ public PlatformColumn findPlatformColumn(String name) {
     }
 
     private PlatformColumn findDifferentVersionPlatformColumn(String name) {
-        for (Entry<String, PlatformColumn> entry : platformColumns.entrySet()) {
-            if (entry.getKey() != null && entry.getKey().contains(name)) {
-                return entry.getValue();
+        if (platformColumns != null) {
+            for (Entry<String, PlatformColumn> entry : platformColumns.entrySet()) {
+                if (entry.getKey() != null && entry.getKey().contains(name)) {
+                    return entry.getValue();
+                }
             }
         }
         return null;
     }
 
     public boolean anyPlatformColumnNameContains(String name) {
-        for (String platformColumnName : platformColumns.keySet()) {
-            if (platformColumnName != null && platformColumnName.contains(name)) {
-                return true;
+        if (platformColumns != null) {
+            for (String platformColumnName : platformColumns.keySet()) {
+                if (platformColumnName != null && platformColumnName.contains(name)) {
+                    return true;
+                }
             }
         }
         return false;
     }
 
     public boolean anyPlatformColumnTypeContains(String type) {
-        for (PlatformColumn platformColumn : platformColumns.values()) {
-            if (platformColumn.getType() != null && platformColumn.getType().contains(type)) {
-                return true;
+        if (platformColumns != null) {
+            for (PlatformColumn platformColumn : platformColumns.values()) {
+                if (platformColumn.getType() != null && platformColumn.getType().contains(type)) {
+                    return true;
+                }
             }
         }
         return false;
     }
 
     public boolean allPlatformColumnNamesContain(String name) {
-        for (String platformColumnName : platformColumns.keySet()) {
-            if (platformColumnName != null && !platformColumnName.contains(name)) {
-                return false;
+        if (platformColumns != null) {
+            for (String platformColumnName : platformColumns.keySet()) {
+                if (platformColumnName != null && !platformColumnName.contains(name)) {
+                    return false;
+                }
             }
         }
         return true;