Author: dkulp
Date: Wed Mar 17 13:24:13 2010
New Revision: 924283
URL: http://svn.apache.org/viewvc?rev=924283&view=rev
Log:
Merged revisions 924275 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r924275 | dkulp | 2010-03-17 09:17:55 -0400 (Wed, 17 Mar 2010) | 1 line
Add an NPE guard and better error message
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=924283&r1=924282&r2=924283&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Wed Mar 17 13:24:13 2010
@@ -240,11 +240,11 @@ public class ReflectionServiceFactoryBea
try {
res = new URIResolver(l);
} catch (IOException e) {
- throw new ServiceConstructionException(new
Message("INVALID_SCHEMA_URL", LOG), e);
+ throw new ServiceConstructionException(new
Message("INVALID_SCHEMA_URL", LOG, l), e);
}
if (!res.isResolved()) {
- throw new ServiceConstructionException(new
Message("INVALID_SCHEMA_URL", LOG));
+ throw new ServiceConstructionException(new
Message("INVALID_SCHEMA_URL", LOG, l));
}
url = res.getURL();
}
@@ -742,6 +742,10 @@ public class ReflectionServiceFactoryBea
}
setFaultClassInfo(o, method);
+ if (o.getUnwrappedOperation() == null) {
+ throw new ServiceConstructionException(new
Message("COULD_NOT_UNWRAP", LOG,
+
o.getName(), method));
+ }
o = o.getUnwrappedOperation();
} else if (o.isUnwrappedCapable()) {
// remove the unwrapped operation because it will break the
Modified:
cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties?rev=924283&r1=924282&r2=924283&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties
(original)
+++
cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties
Wed Mar 17 13:24:13 2010
@@ -31,4 +31,6 @@ UNMAPPABLE_PORT_TYPE= Service class {0}
INTRACTABLE_PART= Message part {0} of Message {1} cannot be processed. This
can be caused by the use of JAX-WS-specific types \
without the JAX-WS service factory bean.
JAXWS_ANNOTATION_FOUND=A JAX-WS Annotation was found on {0} while using the
Simple frontend. For better results, use the JAX-WS frontend.
-XSD_VALIDATION_ERROR= Error in W3C XML Schema associated with service: {0}
\ No newline at end of file
+XSD_VALIDATION_ERROR= Error in W3C XML Schema associated with service: {0}
+COULD_NOT_UNWRAP=Could not unwrap Operation {0} to match method "{1}"
+INVALID_SCHEMA_URL=Could not load schema {0}
\ No newline at end of file
