You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/08/29 10:02:30 UTC
svn commit: r570682 -
/incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCService.java
Author: jsdelfino
Date: Wed Aug 29 01:02:29 2007
New Revision: 570682
URL: http://svn.apache.org/viewvc?rev=570682&view=rev
Log:
Use the new getServletMapping method instead of removing/re-adding the same servlet.
Modified:
incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCService.java
Modified: incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCService.java?rev=570682&r1=570681&r2=570682&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCService.java (original)
+++ incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCService.java Wed Aug 29 01:02:29 2007
@@ -83,11 +83,11 @@
// get the ScaDomainScriptServlet, if it doesn't yet exist create one
// this uses removeServletMapping / addServletMapping as theres no getServletMapping facility
URI domainURI = URI.create("http://localhost:" + port + SCA_DOMAIN_SCRIPT);
- ScaDomainScriptServlet scaDomainServlet = (ScaDomainScriptServlet) servletHost.removeServletMapping(domainURI.toString());
+ ScaDomainScriptServlet scaDomainServlet = (ScaDomainScriptServlet) servletHost.getServletMapping(domainURI.toString());
if (scaDomainServlet == null) {
scaDomainServlet = new ScaDomainScriptServlet();
+ servletHost.addServletMapping(domainURI.toString(), scaDomainServlet);
}
- servletHost.addServletMapping(domainURI.toString(), scaDomainServlet);
// Add this service to the scadomain script servlet
scaDomainServlet.addService(binding.getName());
@@ -105,14 +105,14 @@
port = 8080;
// Unregister the service from the scaDomain script servlet
- // don't unregister the scaDomain script servlet if it still has other service names
URI domainURI = URI.create("http://localhost:" + port + SCA_DOMAIN_SCRIPT);
- ScaDomainScriptServlet scaDomainServlet = (ScaDomainScriptServlet) servletHost.removeServletMapping(domainURI.toString());
+ ScaDomainScriptServlet scaDomainServlet = (ScaDomainScriptServlet) servletHost.getServletMapping(domainURI.toString());
if (scaDomainServlet != null) {
scaDomainServlet.removeService(binding.getName());
- // put it back if there are still other services registered with the servlet
- if (scaDomainServlet.getServiceNames().size() > 0) {
- servletHost.addServletMapping(domainURI.toString(), scaDomainServlet);
+
+ // Remove the servlet if there's no more registered services
+ if (scaDomainServlet.getServiceNames().isEmpty()) {
+ servletHost.removeServletMapping(domainURI.toString());
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org