1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ClientContainer.java Thu Apr 04 19:05:24 2013 -0700 1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ClientContainer.java Tue Apr 09 14:51:13 2013 +0100 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 1997, 2012, 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 @@ -47,6 +47,9 @@ 1.11 }; 1.12 1.13 public <T> T getSPI(Class<T> spiType) { 1.14 + T t = super.getSPI(spiType); 1.15 + if (t != null) 1.16 + return t; 1.17 if (spiType == ResourceLoader.class) { 1.18 return spiType.cast(loader); 1.19 }