harmonize conflict in ParserServlet
authoradam <adam@megacz.com>
Mon, 26 Feb 2007 01:47:49 +0000 (20:47 -0500)
committeradam <adam@megacz.com>
Mon, 26 Feb 2007 01:47:49 +0000 (20:47 -0500)
darcs-hash:20070226014749-5007d-a40ec61d3d535c3403d0bc29a1d3758f7a02b92a.gz

src/edu/berkeley/sbp/misc/ParserServlet.java

index d2f7d39..9eeb7b8 100644 (file)
@@ -6,19 +6,17 @@ import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.chr.*;
 import java.util.*;
 import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.io.*;
+//import javax.servlet.*;
+//import javax.servlet.http.*;
 import java.net.*;
 import java.util.*;
 
-public class ParserServlet extends HttpServlet {
-
+public class ParserServlet /*extends HttpServlet*/ {
+    /*
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException {
         doPost(req, resp);
     }
     public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException {
-        /*
         try {
         try {
             System.out.println("a");
@@ -72,7 +70,7 @@ public class ParserServlet extends HttpServlet {
         } catch (Exception e) {
             throw new ServletException(e);
         }
-        */
-    }
+       
+  }
     */
 }