X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fconfigdialog%2FComponentConfigDialog.java;fp=src%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fconfigdialog%2FComponentConfigDialog.java;h=b2ddc16f17edf32dfe5ed2895f9af3869990fe0b;hb=e298a9509613f232227d16d28310611b33c3aa03;hp=11c4e2d62449368d21e2d50db5d9a372638cff2b;hpb=c71eeba85a8a25e1bd43b27ad09cb2238139b737;p=debian%2Fopenrocket

diff --git a/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java b/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java
index 11c4e2d6..b2ddc16f 100644
--- a/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java
+++ b/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java
@@ -114,7 +114,7 @@ public class ComponentConfigDialog extends JDialog implements ComponentChangeLis
 			} catch (IllegalAccessException e) {
 				throw new BugException("BUG in constructor reflection",e);
 			} catch (InvocationTargetException e) {
-				throw Reflection.handleInvocationTargetException(e);
+				throw Reflection.handleWrappedException(e);
 			}
 		}
 		
@@ -232,7 +232,14 @@ public class ComponentConfigDialog extends JDialog implements ComponentChangeLis
 			dialog.setVisible(false);
 
 		} else {
-			configurator.updateFields();
+			/*
+			 * TODO: HIGH:  The line below has caused a NullPointerException (without null check)
+			 * How is this possible?  The null check was added to avoid this, but the
+			 * root cause should be analyzed.
+			 * [Openrocket-bugs] 2009-12-12 19:23:22 Automatic bug report for OpenRocket 0.9.5
+			 */
+			if (configurator != null)
+				configurator.updateFields();
 		}
 	}