You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2012/12/17 15:58:00 UTC
svn commit: r1422960 - in /cxf/branches/2.6.x-fixes: ./
rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java
Author: sergeyb
Date: Mon Dec 17 14:57:59 2012
New Revision: 1422960
URL: http://svn.apache.org/viewvc?rev=1422960&view=rev
Log:
Merged revisions 1422958 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1422958 | sergeyb | 2012-12-17 14:55:19 +0000 (Mon, 17 Dec 2012) | 1 line
AtomPojoProvider will throw NPE if interface classes are used
........
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1422958
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java?rev=1422960&r1=1422959&r2=1422960&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java (original)
+++ cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java Mon Dec 17 14:57:59 2012
@@ -283,7 +283,7 @@ public class AtomPojoProvider extends Ab
return null;
}
- private <T> T getAtomElementHandler(Map<String, T> handlers, Class<?> pojoClass) {
+ protected <T> T getAtomElementHandler(Map<String, T> handlers, Class<?> pojoClass) {
T handler = getAtomElementHandlerSuperClass(handlers, pojoClass);
if (handler == null) {
Class<?>[] interfaces = pojoClass.getInterfaces();
@@ -298,7 +298,7 @@ public class AtomPojoProvider extends Ab
}
private <T> T getAtomElementHandlerSuperClass(Map<String, T> handlers, Class<?> pojoClass) {
- if (pojoClass == Object.class) {
+ if (pojoClass == null || pojoClass == Object.class) {
return null;
}
T handler = handlers.get(pojoClass.getName());