You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by gm...@apache.org on 2011/03/08 19:25:47 UTC
svn commit: r1079468 - in
/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs:
JAXRSInvoker.java JAXRSServerFactoryBean.java
Author: gmazza
Date: Tue Mar 8 18:25:46 2011
New Revision: 1079468
URL: http://svn.apache.org/viewvc?rev=1079468&view=rev
Log:
Moved JAXRSInvoker.getActualServiceObject() to protected, after discussion with Sergey
Modified:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java?rev=1079468&r1=1079467&r2=1079468&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java Tue Mar 8 18:25:46 2011
@@ -274,7 +274,7 @@ public class JAXRSInvoker extends Abstra
return cri.getResourceProvider().getInstance(exchange.getInMessage());
}
- public Object getActualServiceObject(Exchange exchange, Object rootInstance) {
+ protected Object getActualServiceObject(Exchange exchange, Object rootInstance) {
Object last = exchange.get(LAST_SERVICE_OBJECT);
return last != null ? last : rootInstance;
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java?rev=1079468&r1=1079467&r2=1079468&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java Tue Mar 8 18:25:46 2011
@@ -166,8 +166,6 @@ public class JAXRSServerFactoryBean exte
}
}
- // TODO: deprecate? default invoker can be changed by subclassing
- // JAXRSServiceFactoryBean
protected Invoker createInvoker() {
return serviceFactory.createInvoker();
}