commit 88df15dcae26c012fe69be18dac1b47c89840b5b
author Roberto E. Escobar <roberto.e.escobar@boeing.com> Tue Jul 30 13:20:46 2013 -0700
committer Roberto E. Escobar <roberto.e.escobar@boeing.com> Mon Aug 19 15:20:49 2013 -0700
tree 9dda73d75b6687b39a81dbd3639b2e9826db49fb
parent 701e79dd1e586d5c1a1384074477a1fceb110cf1

bug[ats_0YW5S]: Fix NPE during MergeView save state

Change-Id: I9e0508af0a60e4ac405c68290cae8f358484fae9

plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java

diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java
index b0fa7e3..09ee628 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java
@@ -236,17 +236,25 @@
    @Override
    public void saveState(IMemento memento) {
       super.saveState(memento);
-      memento = memento.createChild(INPUT);
-      if (sourceBranch != null) {
-         memento.putInteger(SOURCE_BRANCH_ID, sourceBranch.getId());
-         memento.putInteger(DEST_BRANCH_ID, destBranch.getId());
-         memento.putInteger(TRANSACTION_NUMBER, transactionId.getId());
-      } else if (commitTrans != null) {
-         memento.putInteger(COMMIT_NUMBER, commitTrans.getId());
-      }
-
-      if (sourceBranch != null || commitTrans != null) {
-         SkynetViews.addDatabaseSourceId(memento);
+      if (commitTrans != null || sourceBranch != null || destBranch != null || transactionId != null) {
+         try {
+            IMemento childMemento = memento.createChild(INPUT);
+            if (commitTrans != null) {
+               childMemento.putInteger(COMMIT_NUMBER, commitTrans.getId());
+            }
+            if (sourceBranch != null) {
+               childMemento.putInteger(SOURCE_BRANCH_ID, sourceBranch.getId());
+            }
+            if (destBranch != null) {
+               childMemento.putInteger(DEST_BRANCH_ID, destBranch.getId());
+            }
+            if (transactionId != null) {
+               childMemento.putInteger(TRANSACTION_NUMBER, transactionId.getId());
+            }
+            SkynetViews.addDatabaseSourceId(childMemento);
+         } catch (Exception ex) {
+            OseeLog.log(Activator.class, Level.WARNING, "Merge View save state error", ex);
+         }
       }
    }