Project

General

Profile

« Previous | Next » 

Revision 5076

Added by daigle over 14 years ago

Change RequestUtil forwardRequest() method to throw MetacatUtilException.

View differences:

PropertiesAdmin.java
26 26

  
27 27
package edu.ucsb.nceas.metacat.admin;
28 28

  
29
import java.io.IOException;
30 29
import java.util.Vector;
31 30

  
32
import javax.servlet.ServletException;
33 31
import javax.servlet.http.HttpServletRequest;
34 32
import javax.servlet.http.HttpServletResponse;
35 33

  
......
39 37
import edu.ucsb.nceas.metacat.database.DBVersion;
40 38
import edu.ucsb.nceas.metacat.properties.PropertyService;
41 39
import edu.ucsb.nceas.metacat.service.ServiceService;
40
import edu.ucsb.nceas.metacat.shared.MetacatUtilException;
42 41
import edu.ucsb.nceas.metacat.shared.ServiceException;
43 42
import edu.ucsb.nceas.metacat.util.RequestUtil;
44 43
import edu.ucsb.nceas.metacat.util.SystemUtil;
......
162 161
			} catch (GeneralPropertyException gpe) {
163 162
				throw new AdminException("PropertiesAdmin.configureProperties - Problem getting or " + 
164 163
						"setting property while initializing system properties page: " + gpe.getMessage());
165
			} catch (IOException ioe) {
166
				throw new AdminException("PropertiesAdmin.configureProperties - IO problem while initializing "
167
						+ "system properties page:" + ioe.getMessage());
164
			} catch (MetacatUtilException mue) {
165
				throw new AdminException("PropertiesAdmin.configureProperties - utility problem while initializing "
166
						+ "system properties page:" + mue.getMessage());
168 167
			} catch (ServiceException se) {
169 168
				throw new AdminException("PropertiesAdmin.configureProperties - Service problem while initializing "
170 169
						+ "system properties page:" + se.getMessage());
171
			} catch (ServletException se) {
172
				throw new AdminException("PropertiesAdmin.configureProperties - problem forwarding request while " 
173
						+ "initializing system properties page: " + se.getMessage());
174
			}
170
			} 
175 171
		} else {
176 172
			// The configuration form is being submitted and needs to be
177 173
			// processed.
......
296 292
					RequestUtil.forwardRequest(request, response, 
297 293
							"/admin?configureType=configure&processForm=false", null);
298 294
				}
299

  
300
			} catch (ServletException se) {
301
				throw new AdminException("PropertiesAdmin.configureProperties - problem forwarding request while "
302
						+ "processing system properties page: " + se.getMessage());
303
			} catch (IOException ioe) {
304
				throw new AdminException("PropertiesAdmin.configureProperties - IO problem while processing system "
305
						+ "properties page: " + ioe.getMessage());
295
			} catch (MetacatUtilException mue) {
296
				throw new AdminException("PropertiesAdmin.configureProperties - utility problem while processing system "
297
						+ "properties page: " + mue.getMessage());
306 298
			} catch (GeneralPropertyException gpe) {
307 299
				throw new AdminException("PropertiesAdmin.configureProperties - problem with properties while "
308 300
						+ "processing system properties page: " + gpe.getMessage());

Also available in: Unified diff