You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2012/10/12 05:33:54 UTC
svn commit: r1397423 -
/tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java
Author: rfeng
Date: Fri Oct 12 03:33:53 2012
New Revision: 1397423
URL: http://svn.apache.org/viewvc?rev=1397423&view=rev
Log:
Reuse the DeploymentConfiguration
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java
Modified: tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java?rev=1397423&r1=1397422&r2=1397423&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java Fri Oct 12 03:33:53 2012
@@ -132,6 +132,11 @@ public class TuscanyRESTServlet extends
public DeploymentConfiguration getDeploymentConfiguration() throws ClassNotFoundException, InstantiationException,
IllegalAccessException, IOException {
+ DeploymentConfiguration config =
+ (DeploymentConfiguration)getServletContext().getAttribute(DeploymentConfiguration.class.getName());
+ if (config != null) {
+ return config;
+ }
// setup proper classLoader to work on OSGi environment
ClassLoader cl =
@@ -141,9 +146,9 @@ public class TuscanyRESTServlet extends
"/META-INF/wink-alternate-shortcuts.properties",
"/META-INF/server/wink-providers");
- DeploymentConfiguration config = null;
try {
config = super.getDeploymentConfiguration();
+ getServletContext().setAttribute(DeploymentConfiguration.class.getName(), config);
} finally {
if (cl != null) {
// return previous classLoader
@@ -155,19 +160,19 @@ public class TuscanyRESTServlet extends
config.setFilterConfig(new FilterConfig() {
public ServletContext getServletContext() {
- return getServletContext();
+ return TuscanyRESTServlet.this.getServletContext();
}
public Enumeration getInitParameterNames() {
- return getInitParameterNames();
+ return TuscanyRESTServlet.this.getInitParameterNames();
}
- public String getInitParameter(String arg0) {
- return getInitParameter(arg0);
+ public String getInitParameter(String p) {
+ return TuscanyRESTServlet.this.getInitParameter(p);
}
public String getFilterName() {
- return getServletName();
+ return TuscanyRESTServlet.this.getServletName();
}
});