You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/06/02 11:31:06 UTC
svn commit: r411106 -
/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/WildcardHelper.java
Author: cziegeler
Date: Fri Jun 2 02:31:06 2006
New Revision: 411106
URL: http://svn.apache.org/viewvc?rev=411106&view=rev
Log:
Fix recently introduced bug
Modified:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/WildcardHelper.java
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=411106&r1=411105&r2=411106&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 Fri Jun 2 02:31:06 2006
@@ -204,6 +204,9 @@
if ( buffpos != buff.length ) {
int startpos = buffpos - (charpos - exprpos);
while ( buffpos != buff.length ) {
+ if ( exprpos == charpos ) {
+ return false;
+ }
buffpos -= (charpos - exprpos);
buffpos++;
offset = indexOfArray (expr, exprpos, charpos, buff, buffpos);
@@ -283,7 +286,7 @@
throw new IllegalArgumentException ("rend < rpos");
// If we need to match a zero length string return current dpos
if (rend == rpos)
- return (d.length); //?? dpos?
+ return d.length; //?? dpos?
// If we need to match a 1 char length string do it simply
if ((rend - rpos) == 1) {
// Search for the specified character