Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2014-02-24 03:29:01 +0000
committerGreg Wilkins2014-02-24 03:29:01 +0000
commit6e0f8b505e3d72a5ce04c8a3972de2b563a239c8 (patch)
treeea674aaaf971e8a26e2ceb7316515401c76df634 /jetty-plus
parent4ce60a1c83d24a81395f6664d0d25dbc968d67af (diff)
downloadorg.eclipse.jetty.project-6e0f8b505e3d72a5ce04c8a3972de2b563a239c8.tar.gz
org.eclipse.jetty.project-6e0f8b505e3d72a5ce04c8a3972de2b563a239c8.tar.xz
org.eclipse.jetty.project-6e0f8b505e3d72a5ce04c8a3972de2b563a239c8.zip
428859 patches from quickstart branch
Diffstat (limited to 'jetty-plus')
-rw-r--r--jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java13
1 files changed, 9 insertions, 4 deletions
diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java
index 5edb826a69..66b4ddccc0 100644
--- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java
+++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java
@@ -147,12 +147,17 @@ public class ContainerInitializer
}
}
}
-
+
public String toString()
{
- List<String> interested = new ArrayList<>(_interestedTypes.length);
- for (Class<?> c : _interestedTypes)
- interested.add(c.getName());
+ List<String> interested = Collections.emptyList();
+ if (_interestedTypes != null)
+ {
+ interested = new ArrayList<>(_interestedTypes.length);
+ for (Class<?> c : _interestedTypes)
+ interested.add(c.getName());
+ }
+
return String.format("ContainerInitializer{%s,interested=%s,applicable=%s,annotated=%s}",_target.getClass().getName(),interested,_applicableTypeNames,_annotatedTypeNames);
}

Back to the top