svn commit: r833894 - /tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/util/io/DataSqueezerImpl.java

[andyhot]

Author: andyhot
Date: Sun Nov  8 17:12:53 2009
New Revision: 833894

URL: http://svn.apache.org/viewvc?rev=833894&view=rev
Log:
TAPESTRY-1974: DataSqueezerImpl - fix conflicting prefix not shown

Modified:
    
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/util/io/DataSqueezerImpl.java

Modified: 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/util/io/DataSqueezerImpl.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/util/io/DataSqueezerImpl.java?rev=833894&r1=833893&r2=833894&view=diff
==============================================================================
--- 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/util/io/DataSqueezerImpl.java
 (original)
+++ 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/util/io/DataSqueezerImpl.java
 Sun Nov  8 17:12:53 2009
@@ -100,8 +100,7 @@
 
             if (_adaptorByPrefix[offset] != null)
                 throw new IllegalArgumentException(Tapestry.format(
-                        "DataSqueezer.adaptor-prefix-taken",
-                        prefix.substring(i, i)));
+                               "DataSqueezer.adaptor-prefix-taken", "" + ch));
 
             _adaptorByPrefix[offset] = adaptor;
 
@@ -168,7 +167,7 @@
         if (offset >= 0 && offset < _adaptorByPrefix.length)
             adaptor = _adaptorByPrefix[offset];
 
-        // If the adaptor is not otherwise recognized, the it is simply
+        // If the adaptor is not otherwise recognized, then it is simply
         // an encoded String (the StringAdaptor may not have added
         // a prefix).