Merge pull request #7000 from kellykelly3/DataContentPanel-NPE-Issue

Fixed NPE that will found when integrating all of the content viewer …
This commit is contained in:
Richard Cordovano 2021-05-26 16:02:49 -04:00 committed by GitHub
commit faf4e9a70a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -140,6 +140,8 @@ public class DataContentPanel extends javax.swing.JPanel implements DataContent,
workerThread = null; workerThread = null;
} }
currentNode = null;
// Reset everything // Reset everything
for (int index = 0; index < jTabbedPane1.getTabCount(); index++) { for (int index = 0; index < jTabbedPane1.getTabCount(); index++) {
jTabbedPane1.setEnabledAt(index, false); jTabbedPane1.setEnabledAt(index, false);
@ -299,7 +301,7 @@ public class DataContentPanel extends javax.swing.JPanel implements DataContent,
try { try {
WorkerResults results = get(); WorkerResults results = get();
currentNode = node;
if (results != null) { if (results != null) {
updateTabs(results.getNode(), results.getSupportedIndices(), results.getPreferredViewerIndex()); updateTabs(results.getNode(), results.getSupportedIndices(), results.getPreferredViewerIndex());
} }