You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by as...@apache.org on 2012/02/13 19:19:26 UTC
svn commit: r1243635 - in /cxf/branches/2.5.x-fixes: ./
rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
Author: asoldano
Date: Mon Feb 13 18:19:26 2012
New Revision: 1243635
URL: http://svn.apache.org/viewvc?rev=1243635&view=rev
Log:
Merged revisions 1243620 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1243620 | asoldano | 2012-02-13 18:49:31 +0100 (Mon, 13 Feb 2012) | 2 lines
[CXF-4103] Prevent NPE
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 13 18:19:26 2012
@@ -1 +1 @@
-/cxf/trunk:1236720,1241934,1242263,1242359,1242729,1242739,1242840-1242842,1242847,1242948,1243432
+/cxf/trunk:1236720,1241934,1242263,1242359,1242729,1242739,1242840-1242842,1242847,1242948,1243432,1243620
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java?rev=1243635&r1=1243634&r2=1243635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java Mon Feb 13 18:19:26 2012
@@ -575,12 +575,14 @@ public class WSDLGetUtils {
}
private String findSchemaLocation(Map<String, SchemaReference> doneSchemas, SchemaReference imp) {
- for (Map.Entry<String, SchemaReference> e : doneSchemas.entrySet()) {
- if (e.getValue().getReferencedSchema().getElement()
- == imp.getReferencedSchema().getElement()) {
- doneSchemas.put(imp.getSchemaLocationURI(), imp);
- imp.setSchemaLocationURI(e.getKey());
- return e.getKey();
+ if (imp.getReferencedSchema() != null) {
+ for (Map.Entry<String, SchemaReference> e : doneSchemas.entrySet()) {
+ if (e.getValue().getReferencedSchema().getElement()
+ == imp.getReferencedSchema().getElement()) {
+ doneSchemas.put(imp.getSchemaLocationURI(), imp);
+ imp.setSchemaLocationURI(e.getKey());
+ return e.getKey();
+ }
}
}
return imp.getSchemaLocationURI();