Mercurial > hg > tomcat-userconfig

changeset 23:d5f928a0c600

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Coding style.
author Mikhail Kryshen <mikhail@kryshen.net>
date Tue, 03 Nov 2009 05:06:48 +0300
parents e67c9a4b6763
children 497bd05771eb
files src/kryshen/catalina/userconfig/UserConfig.java
diffstat 1 files changed, 3 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/kryshen/catalina/userconfig/UserConfig.java	Tue Nov 03 05:04:35 2009 +0300
+++ b/src/kryshen/catalina/userconfig/UserConfig.java	Tue Nov 03 05:06:48 2009 +0300
@@ -167,11 +167,8 @@
                 break;
             }
 
-            if (files[i].equalsIgnoreCase("META-INF")) {
-                continue;
-            }
-
-            if (files[i].equalsIgnoreCase("WEB-INF")) {
+            if (files[i].equalsIgnoreCase("META-INF") ||
+                    files[i].equalsIgnoreCase("WEB-INF")) {
                 continue;
             }
 
@@ -183,11 +180,7 @@
 
             String contextPath = getContextPath(user, files[i]);
 
-            if (isDeployed(contextPath)) {
-                continue;
-            }
-
-            if (isServiced(contextPath)) {
+            if (isDeployed(contextPath) || isServiced(contextPath)) {
                 continue;
             }