Fixing NullPointerException in IndexerGroup init, not being able to f…

…ind java.http.Servlet, integration test not working b/c server not started (connection refused)
fcrepo4-archive · Aug 20, 2013 · b8a8bed · b8a8bed
1 parent f94e6ac
commit b8a8bed
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/pom.xml b/pom.xml
@@ -75,6 +75,27 @@
       <version>${activemq.version}</version>
     </dependency>
     <!-- test gear -->
+    <!-- adding the glassfish/jersey deps fixes problem of missing Java EE classes, but still not getting a server running -->
+    <dependency>
+      <groupId>org.glassfish.grizzly</groupId>
+      <artifactId>grizzly-http-server</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.grizzly</groupId>
+      <artifactId>grizzly-http-servlet</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-grizzly2</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-grizzly2-servlet</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/src/main/java/org/fcrepo/indexer/IndexerGroup.java b/src/main/java/org/fcrepo/indexer/IndexerGroup.java
@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 import java.io.StringReader;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -81,6 +82,9 @@ public void setIndexers(Set indexers) {
         for (Iterator it = indexers.iterator(); it.hasNext();) {
             Object o = it.next();
             if (o instanceof Indexer) {
+                if (this.indexers == null) {
+                    this.indexers = new HashSet<Indexer>();
+                }
                 this.indexers.add( (Indexer)o );
             }
         }