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 2017/04/05 15:09:43 UTC
cxf git commit: Fixing 3.0.x checkstyle issue
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 750b01a6e -> b94ebcca7
Fixing 3.0.x checkstyle issue
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b94ebcca
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b94ebcca
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b94ebcca
Branch: refs/heads/3.0.x-fixes
Commit: b94ebcca758266ffccd176b89328da8d50d4a9db
Parents: 750b01a
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Wed Apr 5 16:09:11 2017 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Wed Apr 5 16:09:11 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b94ebcca/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
index ea10274..f6b2bfc 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
@@ -365,7 +365,7 @@ public final class InjectionUtils {
Annotation[] paramAnns,
ParameterType pType,
Message message) {
- if (value == null) {
+ if (value == null || Number.class.isAssignableFrom(pClass) && "".equals(value)) {
return null;
}
if (pType == ParameterType.PATH) {
@@ -394,11 +394,6 @@ public final class InjectionUtils {
}
return theResult;
}
-
- if (Number.class.isAssignableFrom(pClass) && "".equals(value)) {
- //pass empty string to boxed number type will result in 404
- return null;
- }
if (pClass.isPrimitive()) {
try {
T ret = (T)PrimitiveUtils.read(value, pClass);