From: adam <adam@megacz.com>
Date: Mon, 26 Feb 2007 01:48:29 +0000 (-0500)
Subject: harmonize conflict in ParserServlet (again)
X-Git-Tag: tag_for_25-Mar~31
X-Git-Url: http://git.megacz.com/?p=sbp.git;a=commitdiff_plain;h=b7cd03704a32c751575472eadfd433ce15694fce;hp=9406152ce9e037b07b6b832b1535d17ee6aefa45

harmonize conflict in ParserServlet (again)

darcs-hash:20070226014829-5007d-0313de67605fc771b062c9e4b2c60f30660769d6.gz
---

diff --git a/src/edu/berkeley/sbp/misc/ParserServlet.java b/src/edu/berkeley/sbp/misc/ParserServlet.java
index d2f7d39..9eeb7b8 100644
--- a/src/edu/berkeley/sbp/misc/ParserServlet.java
+++ b/src/edu/berkeley/sbp/misc/ParserServlet.java
@@ -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);
         }
-        */
-    }
+       
+  }
     */
 }