You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/08/23 16:31:23 UTC
isis git commit: ISIS-848: When fixtureScriptTypes are not set an
empty Set is returned.
Repository: isis
Updated Branches:
refs/heads/master 88451f5a2 -> ceae9e267
ISIS-848: When fixtureScriptTypes are not set an empty Set is returned.
To avoid NPE's further down the road.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ceae9e26
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ceae9e26
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ceae9e26
Branch: refs/heads/master
Commit: ceae9e267ab25c1e0043357cb25d944a40446a20
Parents: 88451f5
Author: Jeroen van der Wal <je...@stromboli.it>
Authored: Tue Aug 18 19:47:15 2015 +0200
Committer: Jeroen van der Wal <je...@stromboli.it>
Committed: Tue Aug 18 19:47:15 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/isis/applib/AppManifest.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ceae9e26/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java b/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java
index 642854d..7402ae9 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java
@@ -25,13 +25,13 @@ import java.net.URL;
import java.net.URLDecoder;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.jdo.annotations.PersistenceCapable;
-import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import org.reflections.vfs.SystemDir;
@@ -39,7 +39,6 @@ import org.reflections.vfs.Vfs;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.fixturescripts.FixtureScript;
-import org.apache.isis.applib.services.classdiscovery.ClassDiscoveryServiceUsingReflections;
/**
* Programmatic specification of the constituent parts of an application, most specifically the modules that contain
@@ -194,7 +193,7 @@ public interface AppManifest {
private Set<Class<? extends FixtureScript>> fixtureScriptTypes;
public Set<Class<? extends FixtureScript>> getFixtureScriptTypes() {
- return fixtureScriptTypes;
+ return fixtureScriptTypes == null ? new HashSet<Class<? extends FixtureScript>>() : fixtureScriptTypes;
}
public void setFixtureScriptTypes(final Set<Class<? extends FixtureScript>> fixtureScriptTypes) {
this.fixtureScriptTypes = fixtureScriptTypes;