svn commit: r345660 - in /tomcat/sandbox/java/org/apache/coyote/standalone: Main.java MessageWriter.java

[costin]

Author: costin
Date: Sat Nov 19 09:46:43 2005
New Revision: 345660

URL: http://svn.apache.org/viewcvs?rev=345660&view=rev
Log:
Few comments and small changes to expose the mapper.

Modified:
    tomcat/sandbox/java/org/apache/coyote/standalone/Main.java
    tomcat/sandbox/java/org/apache/coyote/standalone/MessageWriter.java

Modified: tomcat/sandbox/java/org/apache/coyote/standalone/Main.java
URL: 
http://svn.apache.org/viewcvs/tomcat/sandbox/java/org/apache/coyote/standalone/Main.java?rev=345660&r1=345659&r2=345660&view=diff
==============================================================================
--- tomcat/sandbox/java/org/apache/coyote/standalone/Main.java (original)
+++ tomcat/sandbox/java/org/apache/coyote/standalone/Main.java Sat Nov 19 
09:46:43 2005
@@ -8,6 +8,7 @@
 import org.apache.coyote.adapters.HelloWorldAdapter;
 import org.apache.coyote.adapters.MapperAdapter;
 import org.apache.coyote.http11.Http11BaseProtocol;
+import org.apache.tomcat.util.http.mapper.Mapper;
 import org.apache.tomcat.util.loader.Loader;
 import org.apache.tomcat.util.loader.Repository;
 
@@ -41,11 +42,18 @@
         proto.setAdapter(cnt);
     }
     
+    public MapperAdapter getMapper() {
+        return mainAdapter;
+    }
+    
     /**
      */
     public void run() {
         init();
-        
+        start();
+    }
+    
+    public void start() {
         if( proto.getPort() == 0 )
             proto.setPort(8800);
         

Modified: tomcat/sandbox/java/org/apache/coyote/standalone/MessageWriter.java
URL: 
http://svn.apache.org/viewcvs/tomcat/sandbox/java/org/apache/coyote/standalone/MessageWriter.java?rev=345660&r1=345659&r2=345660&view=diff
==============================================================================
--- tomcat/sandbox/java/org/apache/coyote/standalone/MessageWriter.java 
(original)
+++ tomcat/sandbox/java/org/apache/coyote/standalone/MessageWriter.java Sat Nov 
19 09:46:43 2005
@@ -116,13 +116,15 @@
 
 
     /**
-     * Byte chunk used to output bytes.
+     * Byte chunk used to output bytes. This is just used to wrap the byte[]
+     * to match the coyote OutputBuffer interface
      */
     private ByteChunk outputChunk = new ByteChunk();
 
 
     /**
-     * Encoding to use.
+     * Encoding to use. 
+     * TODO: isn't it redundant ? enc, gotEnc, conv plus the enc in the bb
      */
     private String enc;
 
@@ -134,13 +136,14 @@
 
 
     /**
-     * List of encoders.
+     * List of encoders. The writer is reused - the encoder mapping 
+     * avoids creating expensive objects. In future it'll contain nio.Charsets
      */
     protected HashMap encoders = new HashMap();
 
 
     /**
-     * Current char to byte converter.
+     * Current char to byte converter. TODO: replace with Charset
      */
     protected C2BConverter conv;
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]