projects
/
sbp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f55eebc
)
harmonize conflict in ParserServlet
author
adam
<adam@megacz.com>
Mon, 26 Feb 2007 01:47:49 +0000
(20:47 -0500)
committer
adam
<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
patch
|
blob
|
history
diff --git
a/src/edu/berkeley/sbp/misc/ParserServlet.java
b/src/edu/berkeley/sbp/misc/ParserServlet.java
index
d2f7d39
..
9eeb7b8
100644
(file)
--- 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 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.*;
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 {
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");
try {
try {
System.out.println("a");
@@
-72,7
+70,7
@@
public class ParserServlet extends HttpServlet {
} catch (Exception e) {
throw new ServletException(e);
}
} catch (Exception e) {
throw new ServletException(e);
}
- */
- }
+
+ }
*/
}
*/
}