1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Container.java Thu Aug 08 10:10:38 2013 -0700 1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Container.java Fri Aug 23 09:57:21 2013 +0100 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -27,7 +27,6 @@ 1.11 1.12 import java.util.Collection; 1.13 import java.util.Collections; 1.14 -import java.util.HashSet; 1.15 import java.util.Set; 1.16 import java.util.concurrent.CopyOnWriteArraySet; 1.17 1.18 @@ -91,6 +90,7 @@ 1.19 } 1.20 1.21 public <S> S getSPI(Class<S> spiType) { 1.22 + if (components == null) return null; 1.23 for (Component c : components) { 1.24 S s = c.getSPI(spiType); 1.25 if (s != null)