bug: Fix potential null pointer errors

Change-Id: I9674834488c5172954f4ed584ff32708100657b6
Signed-off-by: Morgan E. Cook <Morgan.e.cook@boeing.com>

3 files changed, 7 insertions, 5 deletions

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
index a4c1f28dab4..4c941ab3a34 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
@@ -377,8 +377,10 @@ public final class AtsNavigateViewItems implements XNavigateViewItems, IXNavigat
             try {
                Object obj = bundle.loadClass(classname).newInstance();
                IAtsNavigateItem task = (IAtsNavigateItem) obj;
-               for (XNavigateItem navItem : task.getNavigateItems(parentItem)) {
-                  nameToNavItem.put(navItem.getName(), navItem);
+               if (task != null) {
+                  for (XNavigateItem navItem : task.getNavigateItems(parentItem)) {
+                     nameToNavItem.put(navItem.getName(), navItem);
+                  }
                }
             } catch (Exception ex) {
                OseeLog.log(Activator.class, Level.SEVERE, "Error loading AtsNavigateItem extension", ex);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/viewer/model/commands/ConnectionCreateCommand.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/viewer/model/commands/ConnectionCreateCommand.java
index 5091086abf0..74c0e288ee5 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/viewer/model/commands/ConnectionCreateCommand.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/viewer/model/commands/ConnectionCreateCommand.java
@@ -74,7 +74,7 @@ public class ConnectionCreateCommand extends Command {
       // return false, if the source -> target connection exists already
       for (Iterator<?> iter = source.getSourceConnections().iterator(); iter.hasNext();) {
          Connection conn = (Connection) iter.next();
-         if (conn.getTarget().equals(target)) {
+         if (conn != null && conn.getTarget().equals(target)) {
             return false;
          }
       }
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/viewer/model/commands/ConnectionReconnectCommand.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/viewer/model/commands/ConnectionReconnectCommand.java
index 55ecaa79f1d..b11fa8ba911 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/viewer/model/commands/ConnectionReconnectCommand.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/viewer/model/commands/ConnectionReconnectCommand.java
@@ -89,7 +89,7 @@ public class ConnectionReconnectCommand extends Command {
          Connection conn = (Connection) iter.next();
          // return false if a newSource -> oldTarget connection exists already
          // and it is a different instance than the connection-field
-         if (conn.getTarget().equals(oldTarget) && !conn.equals(connection)) {
+         if (conn != null && conn.getTarget().equals(oldTarget) && !conn.equals(connection)) {
             return false;
          }
       }
@@ -109,7 +109,7 @@ public class ConnectionReconnectCommand extends Command {
          Connection conn = (Connection) iter.next();
          // return false if a oldSource -> newTarget connection exists already
          // and it is a differenct instance that the connection-field
-         if (conn.getSource().equals(oldSource) && !conn.equals(connection)) {
+         if (conn != null && conn.getSource().equals(oldSource) && !conn.equals(connection)) {
             return false;
          }
       }