cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r415331 - in /cocoon/trunk/core: cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/WildcardHelper.java cocoon-core/src/main/java/org/apache/cocoon/util/WildcardHelper.java
Date Mon, 19 Jun 2006 13:47:11 GMT
Author: cziegeler
Date: Mon Jun 19 06:47:11 2006
New Revision: 415331

URL: http://svn.apache.org/viewvc?rev=415331&view=rev
Log:
Fix another bug in wildcard helper

Modified:
    cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/WildcardHelper.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/WildcardHelper.java

Modified: cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/WildcardHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/WildcardHelper.java?rev=415331&r1=415330&r2=415331&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/WildcardHelper.java
(original)
+++ cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/WildcardHelper.java
Mon Jun 19 06:47:11 2006
@@ -199,6 +199,9 @@
 
             // Check for END's
             if (exprchr == MATCH_END) {
+                if ( buffpos != buff.length && buff[charpos] == '/') {
+                    return false;
+                }
                 // Check that we reached buffer's end
                 // if not, we'll search again!
                 if ( buffpos != buff.length ) {

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/WildcardHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/WildcardHelper.java?rev=415331&r1=415330&r2=415331&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/WildcardHelper.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/WildcardHelper.java
Mon Jun 19 06:47:11 2006
@@ -199,6 +199,9 @@
 
             // Check for END's
             if (exprchr == MATCH_END) {
+                if ( buffpos != buff.length && buff[charpos] == '/') {
+                    return false;
+                }
                 // Check that we reached buffer's end
                 // if not, we'll search again!
                 if ( buffpos != buff.length ) {



Mime
View raw message