Merge all changes from 1.5.2 branch into trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830026 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 1 insertions, 1 deletions

diff --git a/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java
index 3eaf6bf47a..987ef466fc 100644
--- a/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java
+++ b/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java
@@ -69,7 +69,7 @@ public class DojoModuleActivator implements ModuleActivator {
 
     public void stop(ExtensionPointRegistry registry) {
         Servlet servlet = servletHost.getServletMapping(dojoBaseUri);
-        if(servlet == null) {
+        if(servlet != null) {
             servletHost.removeServletMapping(dojoBaseUri);
             servletHost.removeServletMapping(dojoUri);