Fixed potential NPE

forge · Sep 3, 2014 · 464a579 · 464a579
1 parent d98a49d
commit 464a579
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/.../impl/src/main/java/org/jboss/forge/addon/javaee/jpa/ui/setup/JPASetupConnectionStep.java b/.../impl/src/main/java/org/jboss/forge/addon/javaee/jpa/ui/setup/JPASetupConnectionStep.java
@@ -129,9 +129,11 @@ public Boolean call() throws Exception
    private void initPersistenceUnitName(UIBuilder builder)
    {
       int i = 1;
-      String projectName = getSelectedProject(builder.getUIContext()).getFacet(MetadataFacet.class).getProjectName();
+      Project selectedProject = getSelectedProject(builder.getUIContext());
+      String projectName = selectedProject == null ? "forge" : selectedProject.getFacet(MetadataFacet.class)
+               .getProjectName();
       String unitName = projectName + PersistenceOperations.DEFAULT_UNIT_SUFFIX;
-      while (isExistingPersistenceUnitName(getSelectedProject(builder.getUIContext()), unitName))
+      while (isExistingPersistenceUnitName(selectedProject, unitName))
       {
          unitName = projectName + PersistenceOperations.DEFAULT_UNIT_SUFFIX + "-" + i++;
       }