Fix NPE on import when no patient is selected

knowing · May 18, 2012 · a50482b · a50482b
1 parent 2b0ea0e
commit a50482b
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/...c.ui/src/de/lmu/ifi/dbs/medmon/medic/ui/wizard/pages/TherapyResultPatientAndTypePage.java b/...c.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();
 	}