Issue 14383: TlsScanner takes forever.

Kin Man Chung · Kin Man Chung · commit 7fb3c48983c9 · 2010-11-05T20:33:34.000Z
svn path=/trunk/; revision=1279
diff --git a/impl/src/main/java/org/apache/jasper/runtime/TldScanner.java b/impl/src/main/java/org/apache/jasper/runtime/TldScanner.java
@@ -722,9 +722,9 @@ private boolean addManifestClassPath(List<String> scannedJars,
             } else {
                 p = baseDir + path;
             }
-            if (scannedJars == null || ! scannedJars.contains(p) ||
-                     ! newJars.contains(p)) {
-                 newJars.add(p);
+            if ((scannedJars == null || !scannedJars.contains(p)) &&
+                !newJars.contains(p) ){
+                     newJars.add(p);
             }
         }
         return true;

Original file line number	Diff line number	Diff line change
`@@ -722,9 +722,9 @@ private boolean addManifestClassPath(List<String> scannedJars,`
`722`	`722`	`} else {`
`723`	`723`	`p = baseDir + path;`
`724`	`724`	`}`
`725`		`- if (scannedJars == null \|\| ! scannedJars.contains(p) \|\|`
`726`		`- ! newJars.contains(p)) {`
`727`		`- newJars.add(p);`
	`725`	`+ if ((scannedJars == null \|\| !scannedJars.contains(p)) &&`
	`726`	`+ !newJars.contains(p) ){`
	`727`	`+ newJars.add(p);`
`728`	`728`	`}`
`729`	`729`	`}`
`730`	`730`	`return true;`