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

[dkulp]

Author: dkulp
Date: Thu Apr 12 16:58:18 2012
New Revision: 1325379

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

........
  r1325378 | dkulp | 2012-04-12 12:57:02 -0400 (Thu, 12 Apr 2012) | 1 line
  
  Fix NPE
........

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

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

Modified: 
cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=1325379&r1=1325378&r2=1325379&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 Thu Apr 12 16:58:18 2012
@@ -510,7 +510,7 @@ public class DynamicClientFactory {
                     if (key.contains("#")) {
                         for (ServiceInfo si : serviceList) {
                             for (SchemaInfo sci : si.getSchemas()) {
-                                if (key.equals(sci.getSystemId())) {
+                                if (key != null && 
key.equals(sci.getSystemId())) {
                                     key = null;
                                 }
                             }