cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1329930 - in /cxf/branches/2.4.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
Date Tue, 24 Apr 2012 18:45:41 GMT
Author: dkulp
Date: Tue Apr 24 18:45:41 2012
New Revision: 1329930

URL: http://svn.apache.org/viewvc?rev=1329930&view=rev
Log:
Merged revisions 1325379 via  svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1325379 | dkulp | 2012-04-12 12:58:18 -0400 (Thu, 12 Apr 2012) | 9 lines
  
  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.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java

Propchange: cxf/branches/2.4.x-fixes/
            ('svn:mergeinfo' removed)

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

Modified: cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=1329930&r1=1329929&r2=1329930&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
Tue Apr 24 18:45:41 2012
@@ -508,7 +508,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;
                                 }
                             }



Mime
View raw message