You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2008/05/20 23:15:37 UTC

svn commit: r658439 - in /cxf/branches/2.0.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java

Author: dkulp
Date: Tue May 20 14:15:36 2008
New Revision: 658439

URL: http://svn.apache.org/viewvc?rev=658439&view=rev
Log:
Merged revisions 658323 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r658323 | dkulp | 2008-05-20 12:37:18 -0400 (Tue, 20 May 2008) | 2 lines
  
  [CXF-1596] Add another NPE guard
........

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=658439&r1=658438&r2=658439&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java (original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java Tue May 20 14:15:36 2008
@@ -367,6 +367,9 @@
         do {
             if (tcl instanceof URLClassLoader) {
                 URL[] urls = ((URLClassLoader)tcl).getURLs();
+                if (urls == null) {
+                    urls = new URL[0];
+                }
                 for (URL url : urls) {
                     if (url.getProtocol().startsWith("file")) {
                         try {