commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1142069 - /commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java
Date Fri, 01 Jul 2011 20:22:07 GMT
Author: simonetripodi
Date: Fri Jul  1 20:22:06 2011
New Revision: 1142069

URL: http://svn.apache.org/viewvc?rev=1142069&view=rev
Log:
fixed checkstyle violation: inner assignment should be avoided.

Modified:
    commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java

Modified: commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java?rev=1142069&r1=1142068&r2=1142069&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java
(original)
+++ commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java
Fri Jul  1 20:22:06 2011
@@ -199,13 +199,13 @@ public class ExtendedBaseRules
 
         // Universal wildcards ('*') in the middle of the pattern-string
         List<Rule> recList = null;
-        int parentLastIndex = -1;
         // temporary parentPattern
         // we don't want to change anything....
         String tempParentPattern = parentPattern;
+        int parentLastIndex = tempParentPattern.lastIndexOf( '/' );
         // look for pattern. Here, we search the whole
         // parent. Not ideal, but does the thing....
-        while ( ( parentLastIndex = tempParentPattern.lastIndexOf( '/' ) ) > -1 &&
recList == null )
+        while ( parentLastIndex > -1 && recList == null )
         {
             recList = this.cache.get( tempParentPattern + "/*/" + pattern.substring( lastIndex
+ 1 ) );
             if ( recList != null )
@@ -223,6 +223,8 @@ public class ExtendedBaseRules
                 // we make sure pattern is allowed anywhere.
                 tempParentPattern = parentPattern.substring( 0, parentLastIndex );
             }
+
+            parentLastIndex = tempParentPattern.lastIndexOf( '/' );
         }
 
         // Universal all wildards ('!*')



Mime
View raw message