svn commit: [jahia] r14856 - /trunk/core/src/java/org/jahia/ajax/webdav/DAVAbstractAction.java

[xlawrence]

Author: xlawrence
Date: Mon Aug  7 16:43:32 2006
New Revision: 14856

URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14856&repname=jahia
Log:
fix filter bug that prevented files from being displayed after an upload

Modified:
    trunk/core/src/java/org/jahia/ajax/webdav/DAVAbstractAction.java

Modified: trunk/core/src/java/org/jahia/ajax/webdav/DAVAbstractAction.java
URL: 
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/java/org/jahia/ajax/webdav/DAVAbstractAction.java&rev=14856&repname=jahia
==============================================================================
--- trunk/core/src/java/org/jahia/ajax/webdav/DAVAbstractAction.java (original)
+++ trunk/core/src/java/org/jahia/ajax/webdav/DAVAbstractAction.java Mon Aug  7 
16:43:32 2006
@@ -134,22 +134,26 @@
             } else {
                 final StringTokenizer tokenizer = new StringTokenizer(display, 
",");
                 boolean found = false;
-                while (tokenizer.hasMoreTokens()) {
-                    final String token = tokenizer.nextToken();
-                    if (token.indexOf("*") >= 0) {
-                        final String tmp = token.substring(token.indexOf("*") 
+ 1);
-                        // token contains an expression. ie '*.gif'
-                        if (tmp.indexOf(extension) > -1) {
-                            found = true;
-                            break;
-                        }
-                    } else {
-                        // token contains a full filename. ie 'logo.gif'
-                        if (file.getPath().indexOf(token) > -1) {
-                            found = true;
-                            break;
+                if (display.indexOf("*") > -1) {
+                    while (tokenizer.hasMoreTokens()) {
+                        final String token = tokenizer.nextToken();
+                        if (token.indexOf("*") >= 0) {
+                            final String tmp = 
token.substring(token.indexOf("*") + 1);
+                            // token contains an expression. ie '*.gif'
+                            if (tmp.indexOf(extension) > -1) {
+                                found = true;
+                                break;
+                            }
+                        } else {
+                            // token contains a full filename. ie 'logo.gif'
+                            if (file.getPath().indexOf(token) > -1) {
+                                found = true;
+                                break;
+                            }
                         }
                     }
+                } else {
+                    found = true;
                 }
                 if (! found) return;
             }