From a50482b7ed364e6c442ae85db7df66d900e825d4 Mon Sep 17 00:00:00 2001 From: Nepomuk Seiler Date: Fri, 18 May 2012 22:07:17 +0200 Subject: [PATCH] Fix NPE on import when no patient is selected --- .../pages/TherapyResultPatientAndTypePage.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/de.lmu.ifi.dbs.medmon.medic.ui/src/de/lmu/ifi/dbs/medmon/medic/ui/wizard/pages/TherapyResultPatientAndTypePage.java b/de.lmu.ifi.dbs.medmon.medic.ui/src/de/lmu/ifi/dbs/medmon/medic/ui/wizard/pages/TherapyResultPatientAndTypePage.java index adaa4e8..4da8b1e 100644 --- a/de.lmu.ifi.dbs.medmon.medic.ui/src/de/lmu/ifi/dbs/medmon/medic/ui/wizard/pages/TherapyResultPatientAndTypePage.java +++ b/de.lmu.ifi.dbs.medmon.medic.ui/src/de/lmu/ifi/dbs/medmon/medic/ui/wizard/pages/TherapyResultPatientAndTypePage.java @@ -87,15 +87,14 @@ public int getOption() { * @return */ private void initialize() { - IGlobalSelectionProvider selectionProvider = GlobalSelectionProvider.newInstance(Activator.getBundleContext()); Patient selectedPatient = selectionProvider.getSelection(Patient.class); - - EntityManager tempEM = Activator.getEntityManagerService().createEntityManager(); - Patient mPatient = tempEM.find(Patient.class, selectedPatient.getId()); - tempEM.close(); - - selectPatient(mPatient); + if(selectedPatient != null) { + EntityManager tempEM = Activator.getEntityManagerService().createEntityManager(); + Patient mPatient = tempEM.find(Patient.class, selectedPatient.getId()); + tempEM.close(); + selectPatient(mPatient); + } checkContents(); }