CVS: plexus-container-new/src/java/org/apache/plexus/util InterpolationFilterReader.java,1.1.1.1,1.2

Update of /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/util
In directory eng.werken.com:/tmp/cvs-serv18445

Modified Files:
	InterpolationFilterReader.java 
Log Message:
o Fixed bug that was causing ${not.interpolated} to show up as $not.interpolated}.

Index: InterpolationFilterReader.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/util/InterpolationFilterReader.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- InterpolationFilterReader.java	29 Mar 2003 03:49:44 -0000	1.1.1.1
+++ InterpolationFilterReader.java	25 Apr 2003 18:11:56 -0000	1.2
@@ -220,7 +220,7 @@
             // We could certainly use a better search here to make sure we
             // don't just have something that looks like the begin token but
             // I'll make this assumption for the moment.
-            skip( beginTokenLength - 1 );
+            skip( beginTokenLength - 2 );
 
             StringBuffer key = new StringBuffer();
             do
@@ -254,9 +254,7 @@
             }
             else
             {
-                key.setLength( key.length() - 1 );
-
-                String replaceWith = (String) hash.get( key.toString() );
+                String replaceWith = (String) hash.get( key.substring( 1, key.length() - 1 ) );
                 if ( replaceWith != null )
                 {
                     replaceData = replaceWith;
@@ -265,7 +263,7 @@
                 }
                 else
                 {
-                    String newData = key.toString() + endToken.charAt( 0 );
+                    String newData = key.toString();
                     if ( queuedData == null || queueIndex == -1 )
                     {
                         queuedData = newData;