Revision 5076
Added by daigle over 14 years ago
| MetaCatServlet.java | ||
|---|---|---|
| 671 | 671 |
// Each time metacat is called, check to see if metacat has been |
| 672 | 672 |
// configured. If not then forward to the administration servlet |
| 673 | 673 |
if (!ConfigurationUtil.isMetacatConfigured()) {
|
| 674 |
RequestUtil.forwardRequest(request, response, "/admin?action=configure", null); |
|
| 675 |
return; |
|
| 674 |
try {
|
|
| 675 |
RequestUtil.forwardRequest(request, response, "/admin?action=configure", null); |
|
| 676 |
return; |
|
| 677 |
} catch (MetacatUtilException mue) {
|
|
| 678 |
logMetacat.error("MetacatServlet.handleGetOrPost - utility error when forwarding to " +
|
|
| 679 |
"configuration screen: " + mue.getMessage()); |
|
| 680 |
throw new ServletException("MetacatServlet.handleGetOrPost - utility error when forwarding to " +
|
|
| 681 |
"configuration screen: " + mue.getMessage()); |
|
| 682 |
} |
|
| 676 | 683 |
} |
| 677 | 684 |
|
| 678 | 685 |
// if we get here, metacat is configured. If we have not completed the |
| ... | ... | |
| 697 | 704 |
DBConnectionPool pool = DBConnectionPool.getInstance(); |
| 698 | 705 |
pool.printMethodNameHavingBusyDBConnection(); |
| 699 | 706 |
} catch (SQLException e) {
|
| 700 |
logMetacat.error("Error in MetacatServlet.handleGetOrPost: "
|
|
| 701 |
+ e.getMessage()); |
|
| 707 |
logMetacat.error("Error in MetacatServlet.handleGetOrPost: " + e.getMessage());
|
|
| 702 | 708 |
e.printStackTrace(); |
| 703 | 709 |
} |
| 704 | 710 |
|
Also available in: Unified diff
Change RequestUtil forwardRequest() method to throw MetacatUtilException.