projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tracked down a nasty error reporting bug
[mir.git]
/
source
/
OpenMir.java
diff --git
a/source/OpenMir.java
b/source/OpenMir.java
index
2ea1a6e
..
2c6f092
100755
(executable)
--- a/
source/OpenMir.java
+++ b/
source/OpenMir.java
@@
-74,6
+74,8
@@
public class OpenMir extends AbstractServlet {
// get the configration - this could conflict if 2 mirs are in the
// VM maybe? to be checked. -mh
// get the configration - this could conflict if 2 mirs are in the
// VM maybe? to be checked. -mh
+ // -- they would have different servlet contexts, so the following is
+ // no problem (br1)
if(getServletContext().getAttribute("mir.confed") == null) {
getConfig(req);
}
if(getServletContext().getAttribute("mir.confed") == null) {
getConfig(req);
}
@@
-97,11
+99,11
@@
public class OpenMir extends AbstractServlet {
ServletModuleDispatch.dispatch(ServletModuleOpenIndy.getInstance(),req,res);
}
catch (ServletModuleUserException e) {
ServletModuleDispatch.dispatch(ServletModuleOpenIndy.getInstance(),req,res);
}
catch (ServletModuleUserException e) {
- handleUserError(req,res,res.getWriter(), e.getM
sg
());
+ handleUserError(req,res,res.getWriter(), e.getM
essage
());
}
catch (ServletModuleException e){
e.printStackTrace();
}
catch (ServletModuleException e){
e.printStackTrace();
- handleError(req,res,res.getWriter(), "OpenIndy :: ServletException in Module ServletModule -- " + e.
toString
());
+ handleError(req,res,res.getWriter(), "OpenIndy :: ServletException in Module ServletModule -- " + e.
getMessage
());
}
// timing...
sessionConnectTime = new java.util.Date().getTime() - startTime;
}
// timing...
sessionConnectTime = new java.util.Date().getTime() - startTime;
@@
-120,7
+122,7
@@
public class OpenMir extends AbstractServlet {
out.close();
}
catch (Exception e) {
out.close();
}
catch (Exception e) {
- System.err.println("
Fehle
r in UserErrorTemplate");
+ System.err.println("
Erro
r in UserErrorTemplate");
}
}
}
}
@@
-138,7
+140,7
@@
public class OpenMir extends AbstractServlet {
out.close();
}
catch (Exception e) {
out.close();
}
catch (Exception e) {
- System.err.println("
Fehle
r in ErrorTemplate");
+ System.err.println("
Erro
r in ErrorTemplate");
}
}
}
}