Author: sergeyb
Date: Thu Feb 6 16:50:41 2014
New Revision: 1565341
URL: http://svn.apache.org/r1565341
Log:
Merged revisions 1565339 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1565339 | sergeyb | 2014-02-06 16:48:56 +0000 (Thu, 06 Feb 2014) | 1 line
Preventing the error reporting when checking for getters on JAX-RS providers
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1565339
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java?rev=1565341&r1=1565340&r2=1565341&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
Thu Feb 6 16:50:41 2014
@@ -148,8 +148,9 @@ public abstract class AbstractResourceIn
Object proxy = null;
synchronized (provider) {
try {
- Method getter = m.getClass().getMethod("get" +
m.getName().substring(3), new Class[]{});
- proxy = InjectionUtils.extractFromMethod(provider, getter);
+ proxy = InjectionUtils.extractFromMethod(provider,
+
InjectionUtils.getGetterFromSetter(m),
+ false);
} catch (Throwable t) {
// continue
}
Modified:
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java?rev=1565341&r1=1565340&r2=1565341&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
Thu Feb 6 16:50:41 2014
@@ -319,15 +319,20 @@ public final class InjectionUtils {
}
}
+ public static Object extractFromMethod(Object requestObject, Method
method) {
+ return extractFromMethod(requestObject, method, true);
+ }
+
public static Object extractFromMethod(Object requestObject,
- Method method) {
+ Method method,
+ boolean logError) {
try {
Method methodToInvoke = checkProxy(method, requestObject);
return methodToInvoke.invoke(requestObject);
} catch (IllegalAccessException ex) {
- reportServerError("METHOD_ACCESS_FAILURE", method.getName());
+ reportServerError("METHOD_ACCESS_FAILURE", method.getName(),
logError);
} catch (Exception ex) {
- reportServerError("METHOD_INJECTION_FAILURE", method.getName());
+ reportServerError("METHOD_INJECTION_FAILURE", method.getName(),
logError);
}
return null;
}
@@ -462,11 +467,17 @@ public final class InjectionUtils {
}
public static void reportServerError(String messageName, String parameter)
{
+ reportServerError(messageName, parameter, true);
+ }
+
+ public static void reportServerError(String messageName, String parameter,
boolean logError) {
org.apache.cxf.common.i18n.Message errorMessage =
new org.apache.cxf.common.i18n.Message(messageName,
BUNDLE,
parameter);
- LOG.severe(errorMessage.toString());
+ if (logError) {
+ LOG.severe(errorMessage.toString());
+ }
Response r = Response.status(Response.Status.INTERNAL_SERVER_ERROR)
.type(MediaType.TEXT_PLAIN_TYPE)
.entity(errorMessage.toString()).build();
@@ -980,6 +991,10 @@ public final class InjectionUtils {
}
}
+ public static Method getGetterFromSetter(Method setter) throws Exception {
+ return setter.getClass().getMethod("get" +
setter.getName().substring(3), new Class[]{});
+ }
+
public static void injectContextProxiesAndApplication(AbstractResourceInfo
cri,
Object instance,
Application app) {
@@ -993,7 +1008,9 @@ public final class InjectionUtils {
? app : cri.getContextSetterProxy(method);
try {
synchronized (instance) {
- if (value == InjectionUtils.extractFromMethod(instance,
method)) {
+ if (value == InjectionUtils.extractFromMethod(instance,
+
getGetterFromSetter(method),
+ false)) {
continue;
}
}
