Author: husted
Date: Wed Feb 8 08:38:15 2006
New Revision: 375989
URL: http://svn.apache.org/viewcvs?rev=375989&view=rev
Log:
Checkstyle Roundup
* Action package reformatted with latest Jalopy settings. Stylistic changes
only.
Modified:
struts/action/trunk/src/java/org/apache/struts/action/Action.java
struts/action/trunk/src/java/org/apache/struts/action/ActionForm.java
struts/action/trunk/src/java/org/apache/struts/action/ActionMapping.java
struts/action/trunk/src/java/org/apache/struts/action/ActionMessages.java
struts/action/trunk/src/java/org/apache/struts/action/ActionRedirect.java
struts/action/trunk/src/java/org/apache/struts/action/ActionServlet.java
struts/action/trunk/src/java/org/apache/struts/action/DynaActionForm.java
struts/action/trunk/src/java/org/apache/struts/action/DynaActionFormClass.java
struts/action/trunk/src/java/org/apache/struts/action/ExceptionHandler.java
struts/action/trunk/src/java/org/apache/struts/action/RequestProcessor.java
Modified: struts/action/trunk/src/java/org/apache/struts/action/Action.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/action/Action.java?rev=375989&r1=375988&r2=375989&view=diff
==============================================================================
--- struts/action/trunk/src/java/org/apache/struts/action/Action.java (original)
+++ struts/action/trunk/src/java/org/apache/struts/action/Action.java Wed Feb
8 08:38:15 2006
@@ -137,8 +137,7 @@
try {
return execute(mapping, form, (HttpServletRequest) request,
(HttpServletResponse) response);
- }
- catch (ClassCastException e) {
+ } catch (ClassCastException e) {
return null;
}
}
Modified: struts/action/trunk/src/java/org/apache/struts/action/ActionForm.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/action/ActionForm.java?rev=375989&r1=375988&r2=375989&view=diff
==============================================================================
--- struts/action/trunk/src/java/org/apache/struts/action/ActionForm.java
(original)
+++ struts/action/trunk/src/java/org/apache/struts/action/ActionForm.java Wed
Feb 8 08:38:15 2006
@@ -147,8 +147,7 @@
public void reset(ActionMapping mapping, ServletRequest request) {
try {
reset(mapping, (HttpServletRequest) request);
- }
- catch (ClassCastException e) {
+ } catch (ClassCastException e) {
; // FIXME: Why would this ever happen except a null
}
}
@@ -202,8 +201,7 @@
public ActionErrors validate(ActionMapping mapping, ServletRequest
request) {
try {
return (validate(mapping, (HttpServletRequest) request));
- }
- catch (ClassCastException e) {
+ } catch (ClassCastException e) {
return (null);
}
}
Modified:
struts/action/trunk/src/java/org/apache/struts/action/ActionMapping.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/action/ActionMapping.java?rev=375989&r1=375988&r2=375989&view=diff
==============================================================================
--- struts/action/trunk/src/java/org/apache/struts/action/ActionMapping.java
(original)
+++ struts/action/trunk/src/java/org/apache/struts/action/ActionMapping.java
Wed Feb 8 08:38:15 2006
@@ -106,8 +106,7 @@
public ActionForward getInputForward() {
if (getModuleConfig().getControllerConfig().getInputForward()) {
return (findForward(getInput()));
- }
- else {
+ } else {
return (new ActionForward(getInput()));
}
}
Modified:
struts/action/trunk/src/java/org/apache/struts/action/ActionMessages.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/action/ActionMessages.java?rev=375989&r1=375988&r2=375989&view=diff
==============================================================================
--- struts/action/trunk/src/java/org/apache/struts/action/ActionMessages.java
(original)
+++ struts/action/trunk/src/java/org/apache/struts/action/ActionMessages.java
Wed Feb 8 08:38:15 2006
@@ -129,8 +129,7 @@
item = new ActionMessageItem(list, iCount++, property);
messages.put(property, item);
- }
- else {
+ } else {
list = item.getList();
}
@@ -242,8 +241,7 @@
if (item == null) {
return (Collections.EMPTY_LIST.iterator());
- }
- else {
+ } else {
return (item.getList().iterator());
}
}
Modified:
struts/action/trunk/src/java/org/apache/struts/action/ActionRedirect.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/action/ActionRedirect.java?rev=375989&r1=375988&r2=375989&view=diff
==============================================================================
--- struts/action/trunk/src/java/org/apache/struts/action/ActionRedirect.java
(original)
+++ struts/action/trunk/src/java/org/apache/struts/action/ActionRedirect.java
Wed Feb 8 08:38:15 2006
@@ -166,16 +166,14 @@
if (currentValue == null) {
// there's no value for this param yet; add it to the map
parameterValues.put(fieldName, value);
- }
- else if (currentValue instanceof String) {
+ } else if (currentValue instanceof String) {
// there's already a value; let's use an array for these parameters
String[] newValue = new String[2];
newValue[0] = (String) currentValue;
newValue[1] = value;
parameterValues.put(fieldName, newValue);
- }
- else if (currentValue instanceof String[]) {
+ } else if (currentValue instanceof String[]) {
// add the value to the list of existing values
List newValues =
new ArrayList(Arrays.asList((Object[]) currentValue));
@@ -261,8 +259,7 @@
if (value instanceof String) {
// just one value for this param
strParam.append(paramName).append("=").append(value);
- }
- else if (value instanceof String[]) {
+ } else if (value instanceof String[]) {
// loop through all values for this param
String[] values = (String[]) value;
Modified:
struts/action/trunk/src/java/org/apache/struts/action/ActionServlet.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/action/ActionServlet.java?rev=375989&r1=375988&r2=375989&view=diff
==============================================================================
--- struts/action/trunk/src/java/org/apache/struts/action/ActionServlet.java
(original)
+++ struts/action/trunk/src/java/org/apache/struts/action/ActionServlet.java
Wed Feb 8 08:38:15 2006
@@ -309,8 +309,7 @@
try {
LogFactory.release(classLoader);
- }
- catch (Throwable t) {
+ } catch (Throwable t) {
; // Servlet container doesn't have the latest version
// of commons-logging-api.jar installed
@@ -389,11 +388,9 @@
this.initModulePrefixes(this.getServletContext());
this.destroyConfigDigester();
- }
- catch (UnavailableException ex) {
+ } catch (UnavailableException ex) {
throw ex;
- }
- catch (Throwable t) {
+ } catch (Throwable t) {
// The follow error message is not retrieved from internal message
// resources as they may not have been able to have been
// initialized
@@ -612,8 +609,7 @@
processor =
(RequestProcessor)
RequestUtils.applicationInstance(config.getControllerConfig()
.getProcessorClass());
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new UnavailableException(
"Cannot initialize RequestProcessor of class "
+ config.getControllerConfig().getProcessorClass() + ": "
@@ -718,15 +714,12 @@
URL url = (URL) paths.get(0);
parseModuleConfigFile(digester, url);
- }
- else {
+ } else {
throw new UnavailableException("Cannot locate path " + path);
}
- }
- catch (UnavailableException ex) {
+ } catch (UnavailableException ex) {
throw ex;
- }
- catch (ServletException ex) {
+ } catch (ServletException ex) {
handleConfigException(path, ex);
}
}
@@ -752,19 +745,15 @@
input = conn.getInputStream();
is.setByteStream(input);
digester.parse(is);
- }
- catch (IOException e) {
+ } catch (IOException e) {
handleConfigException(url.toString(), e);
- }
- catch (SAXException e) {
+ } catch (SAXException e) {
handleConfigException(url.toString(), e);
- }
- finally {
+ } finally {
if (input != null) {
try {
input.close();
- }
- catch (IOException e) {
+ } catch (IOException e) {
throw new UnavailableException(e.getMessage());
}
}
@@ -876,8 +865,7 @@
try {
PropertyUtils.setProperty(plugIns[i],
"currentPlugInConfigObject", plugInConfigs[i]);
- }
- catch (Exception e) {
+ } catch (Exception e) {
;
// FIXME Whenever we fail silently, we must document a
valid
@@ -896,11 +884,9 @@
}
plugIns[i].init(this, config);
- }
- catch (ServletException e) {
+ } catch (ServletException e) {
throw e;
- }
- catch (Exception e) {
+ } catch (Exception e) {
String errMsg =
internal.getMessage("plugIn.init",
plugInConfigs[i].getClassName());
@@ -985,11 +971,9 @@
beanConfig.processExtends(moduleConfig);
}
- }
- catch (ServletException e) {
+ } catch (ServletException e) {
throw e;
- }
- catch (Exception e) {
+ } catch (Exception e) {
handleGeneralExtensionException("FormBeanConfig",
beanConfig.getName(), e);
}
@@ -1046,8 +1030,7 @@
for (int i = 0; i < fpc.length; i++) {
newBeanConfig.addFormPropertyConfig(fpc[i]);
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
handleCreationException(baseConfigClassName, e);
}
@@ -1116,11 +1099,9 @@
forwardConfig.processExtends(moduleConfig, null);
}
- }
- catch (ServletException e) {
+ } catch (ServletException e) {
throw e;
- }
- catch (Exception e) {
+ } catch (Exception e) {
handleGeneralExtensionException("Forward", forwardConfig.getName(),
e);
}
@@ -1170,8 +1151,7 @@
// copy the values
BeanUtils.copyProperties(newForwardConfig, forwardConfig);
- }
- catch (Exception e) {
+ } catch (Exception e) {
handleCreationException(baseConfigClassName, e);
}
@@ -1241,11 +1221,9 @@
exceptionConfig.processExtends(moduleConfig, null);
}
- }
- catch (ServletException e) {
+ } catch (ServletException e) {
throw e;
- }
- catch (Exception e) {
+ } catch (Exception e) {
handleGeneralExtensionException("Exception",
exceptionConfig.getType(), e);
}
@@ -1294,8 +1272,7 @@
// copy the values
BeanUtils.copyProperties(newExceptionConfig,
exceptionConfig);
- }
- catch (Exception e) {
+ } catch (Exception e) {
handleCreationException(baseConfigClassName, e);
}
@@ -1384,11 +1361,9 @@
actionConfig.processExtends(moduleConfig);
}
- }
- catch (ServletException e) {
+ } catch (ServletException e) {
throw e;
- }
- catch (Exception e) {
+ } catch (Exception e) {
handleGeneralExtensionException("Action", actionConfig.getPath(),
e);
}
}
@@ -1451,8 +1426,7 @@
for (int i = 0; i < exceptions.length; i++) {
newActionConfig.addExceptionConfig(exceptions[i]);
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
handleCreationException(baseConfigClassName, e);
}
@@ -1572,8 +1546,7 @@
if (comma < 0) {
ruleset = rulesets.trim();
rulesets = "";
- }
- else {
+ } else {
ruleset = rulesets.substring(0, comma).trim();
rulesets = rulesets.substring(comma + 1).trim();
}
@@ -1588,8 +1561,7 @@
(RuleSet) RequestUtils.applicationInstance(ruleset);
this.configDigester.addRuleSet(instance);
- }
- catch (Exception e) {
+ } catch (Exception e) {
log.error("Exception configuring custom Digester RuleSet", e);
throw new ServletException(e);
}
@@ -1624,8 +1596,7 @@
throws ServletException {
try {
internal = MessageResources.getMessageResources(internalName);
- }
- catch (MissingResourceException e) {
+ } catch (MissingResourceException e) {
log.error("Cannot load internal resources from '" + internalName
+ "'", e);
throw new UnavailableException(
@@ -1662,8 +1633,7 @@
log.info("Loading chain catalog from " + resource);
parser.parse(resource);
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
log.error("Exception loading resources", e);
throw new ServletException(e);
}
@@ -1760,20 +1730,16 @@
try {
digester.parse(input);
- }
- catch (IOException e) {
+ } catch (IOException e) {
log.error(internal.getMessage("configWebXml"), e);
throw new ServletException(e);
- }
- catch (SAXException e) {
+ } catch (SAXException e) {
log.error(internal.getMessage("configWebXml"), e);
throw new ServletException(e);
- }
- finally {
+ } finally {
try {
input.close();
- }
- catch (IOException e) {
+ } catch (IOException e) {
log.error(internal.getMessage("configWebXml"), e);
throw new ServletException(e);
}
@@ -1824,8 +1790,7 @@
if (comma >= 0) {
path = paths.substring(0, comma).trim();
paths = paths.substring(comma + 1);
- }
- else {
+ } else {
path = paths.trim();
paths = "";
}
@@ -1852,22 +1817,18 @@
log.error(msg);
throw new UnavailableException(msg);
- }
- else {
+ } else {
while (e.hasMoreElements()) {
resolvedUrls.add(e.nextElement());
}
}
- }
- else {
+ } else {
resolvedUrls.add(resource);
}
}
- }
- catch (MalformedURLException e) {
+ } catch (MalformedURLException e) {
handleConfigException(path, e);
- }
- catch (IOException e) {
+ } catch (IOException e) {
handleConfigException(path, e);
}
Modified:
struts/action/trunk/src/java/org/apache/struts/action/DynaActionForm.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/action/DynaActionForm.java?rev=375989&r1=375988&r2=375989&view=diff
==============================================================================
--- struts/action/trunk/src/java/org/apache/struts/action/DynaActionForm.java
(original)
+++ struts/action/trunk/src/java/org/apache/struts/action/DynaActionForm.java
Wed Feb 8 08:38:15 2006
@@ -203,11 +203,9 @@
if (value == null) {
throw new NullPointerException("No mapped value for '" + name + "("
+ key + ")'");
- }
- else if (value instanceof Map) {
+ } else if (value instanceof Map) {
return (((Map) value).containsKey(key));
- }
- else {
+ } else {
throw new IllegalArgumentException("Non-mapped property for '"
+ name + "(" + key + ")'");
}
@@ -246,29 +244,21 @@
// Manufacture default values for primitive properties
if (type == Boolean.TYPE) {
return (Boolean.FALSE);
- }
- else if (type == Byte.TYPE) {
+ } else if (type == Byte.TYPE) {
return (new Byte((byte) 0));
- }
- else if (type == Character.TYPE) {
+ } else if (type == Character.TYPE) {
return (new Character((char) 0));
- }
- else if (type == Double.TYPE) {
+ } else if (type == Double.TYPE) {
return (new Double(0.0));
- }
- else if (type == Float.TYPE) {
+ } else if (type == Float.TYPE) {
return (new Float((float) 0.0));
- }
- else if (type == Integer.TYPE) {
+ } else if (type == Integer.TYPE) {
return (new Integer(0));
- }
- else if (type == Long.TYPE) {
+ } else if (type == Long.TYPE) {
return (new Long(0));
- }
- else if (type == Short.TYPE) {
+ } else if (type == Short.TYPE) {
return (new Short((short) 0));
- }
- else {
+ } else {
return (null);
}
}
@@ -293,14 +283,11 @@
if (value == null) {
throw new NullPointerException("No indexed value for '" + name
+ "[" + index + "]'");
- }
- else if (value.getClass().isArray()) {
+ } else if (value.getClass().isArray()) {
return (Array.get(value, index));
- }
- else if (value instanceof List) {
+ } else if (value instanceof List) {
return ((List) value).get(index);
- }
- else {
+ } else {
throw new IllegalArgumentException("Non-indexed property for '"
+ name + "[" + index + "]'");
}
@@ -325,11 +312,9 @@
if (value == null) {
throw new NullPointerException("No mapped value for '" + name + "("
+ key + ")'");
- }
- else if (value instanceof Map) {
+ } else if (value instanceof Map) {
return (((Map) value).get(key));
- }
- else {
+ } else {
throw new IllegalArgumentException("Non-mapped property for '"
+ name + "(" + key + ")'");
}
@@ -424,11 +409,9 @@
if (value == null) {
throw new NullPointerException("No mapped value for '" + name + "("
+ key + ")'");
- }
- else if (value instanceof Map) {
+ } else if (value instanceof Map) {
((Map) value).remove(key);
- }
- else {
+ } else {
throw new IllegalArgumentException("Non-mapped property for '"
+ name + "(" + key + ")'");
}
@@ -462,8 +445,7 @@
throw new NullPointerException("Primitive value for '" + name
+ "'");
}
- }
- else if (!isDynaAssignable(descriptor.getType(), value.getClass())) {
+ } else if (!isDynaAssignable(descriptor.getType(), value.getClass())) {
throw new ConversionException("Cannot assign value of type '"
+ value.getClass().getName() + "' to property '" + name
+ "' of type '" + descriptor.getType().getName() + "'");
@@ -494,19 +476,15 @@
if (prop == null) {
throw new NullPointerException("No indexed value for '" + name
+ "[" + index + "]'");
- }
- else if (prop.getClass().isArray()) {
+ } else if (prop.getClass().isArray()) {
Array.set(prop, index, value);
- }
- else if (prop instanceof List) {
+ } else if (prop instanceof List) {
try {
((List) prop).set(index, value);
- }
- catch (ClassCastException e) {
+ } catch (ClassCastException e) {
throw new ConversionException(e.getMessage());
}
- }
- else {
+ } else {
throw new IllegalArgumentException("Non-indexed property for '"
+ name + "[" + index + "]'");
}
@@ -529,11 +507,9 @@
if (prop == null) {
throw new NullPointerException("No mapped value for '" + name + "("
+ key + ")'");
- }
- else if (prop instanceof Map) {
+ } else if (prop instanceof Map) {
((Map) prop).put(key, value);
- }
- else {
+ } else {
throw new IllegalArgumentException("Non-mapped property for '"
+ name + "(" + key + ")'");
}
@@ -571,8 +547,7 @@
if (value == null) {
sb.append("<NULL>");
- }
- else if (value.getClass().isArray()) {
+ } else if (value.getClass().isArray()) {
int n = Array.getLength(value);
sb.append("{");
@@ -586,8 +561,7 @@
}
sb.append("}");
- }
- else if (value instanceof List) {
+ } else if (value instanceof List) {
int n = ((List) value).size();
sb.append("{");
@@ -601,8 +575,7 @@
}
sb.append("}");
- }
- else if (value instanceof Map) {
+ } else if (value instanceof Map) {
int n = 0;
Iterator keys = ((Map) value).keySet().iterator();
@@ -623,8 +596,7 @@
}
sb.append("}");
- }
- else {
+ } else {
sb.append(value);
}
}
@@ -687,8 +659,7 @@
|| ((dest == Long.TYPE) && (source == Long.class))
|| ((dest == Short.TYPE) && (source == Short.class))) {
return (true);
- }
- else {
+ } else {
return (false);
}
}
Modified:
struts/action/trunk/src/java/org/apache/struts/action/DynaActionFormClass.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/action/DynaActionFormClass.java?rev=375989&r1=375988&r2=375989&view=diff
==============================================================================
---
struts/action/trunk/src/java/org/apache/struts/action/DynaActionFormClass.java
(original)
+++
struts/action/trunk/src/java/org/apache/struts/action/DynaActionFormClass.java
Wed Feb 8 08:38:15 2006
@@ -246,8 +246,7 @@
// Validate the ActionFormBean implementation class
try {
beanClass = RequestUtils.applicationClass(config.getType());
- }
- catch (Throwable t) {
+ } catch (Throwable t) {
throw new IllegalArgumentException(
"Cannot instantiate ActionFormBean class '" + config.getType()
+ "': " + t);
Modified:
struts/action/trunk/src/java/org/apache/struts/action/ExceptionHandler.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/action/ExceptionHandler.java?rev=375989&r1=375988&r2=375989&view=diff
==============================================================================
--- struts/action/trunk/src/java/org/apache/struts/action/ExceptionHandler.java
(original)
+++ struts/action/trunk/src/java/org/apache/struts/action/ExceptionHandler.java
Wed Feb 8 08:38:15 2006
@@ -132,8 +132,7 @@
// or from the form input
if (ae.getPath() != null) {
forward = new ActionForward(ae.getPath());
- }
- else {
+ } else {
forward = mapping.getInputForward();
}
@@ -141,8 +140,7 @@
if (ex instanceof ModuleException) {
error = ((ModuleException) ex).getActionMessage();
property = ((ModuleException) ex).getProperty();
- }
- else {
+ } else {
error = new ActionMessage(ae.getKey(), ex.getMessage());
property = error.getKey();
}
@@ -163,8 +161,7 @@
if (!silent(ae)) {
handleCommittedResponse(ex, ae, mapping, formInstance, request,
response, forward);
- }
- else {
+ } else {
LOG.warn("ExceptionHandler configured with " + SILENT_IF_COMMITTED
+ " and response is committed.", ex);
}
@@ -207,17 +204,14 @@
requestDispatcher.include(request, response);
return;
- }
- catch (IOException e) {
+ } catch (IOException e) {
LOG.error("IOException when trying to include "
+ "the error page path " + includePath, e);
- }
- catch (ServletException e) {
+ } catch (ServletException e) {
LOG.error("ServletException when trying to include "
+ "the error page path " + includePath, e);
}
- }
- else {
+ } else {
LOG.warn("Suspicious includePath doesn't seem likely to work, "
+ "so skipping it: " + includePath
+ "; expected path to start with '/'");
@@ -232,8 +226,7 @@
response.getWriter().println("<!-- ");
ex.printStackTrace(response.getWriter());
response.getWriter().println("-->");
- }
- catch (IOException e) {
+ } catch (IOException e) {
LOG.error("Error giving minimal information about exception", e);
LOG.error("Original exception: ", ex);
}
@@ -298,8 +291,7 @@
if ("request".equals(scope)) {
request.setAttribute(Globals.ERROR_KEY, errors);
- }
- else {
+ } else {
request.getSession().setAttribute(Globals.ERROR_KEY, errors);
}
}
Modified:
struts/action/trunk/src/java/org/apache/struts/action/RequestProcessor.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/action/RequestProcessor.java?rev=375989&r1=375988&r2=375989&view=diff
==============================================================================
--- struts/action/trunk/src/java/org/apache/struts/action/RequestProcessor.java
(original)
+++ struts/action/trunk/src/java/org/apache/struts/action/RequestProcessor.java
Wed Feb 8 08:38:15 2006
@@ -269,8 +269,7 @@
// Maybe we should propagate this exception
// instead of returning null.
- }
- catch (Exception e) {
+ } catch (Exception e) {
log.error(getInternal().getMessage("actionCreate",
mapping.getPath()), e);
@@ -321,8 +320,7 @@
if ("request".equals(mapping.getScope())) {
request.setAttribute(mapping.getAttribute(), instance);
- }
- else {
+ } else {
HttpSession session = request.getSession();
session.setAttribute(mapping.getAttribute(), instance);
@@ -361,8 +359,7 @@
if (forwardPath.startsWith("/")) {
// get module relative uri
uri = RequestUtils.forwardURL(request, forward, null);
- }
- else {
+ } else {
uri = forwardPath;
}
@@ -373,8 +370,7 @@
}
response.sendRedirect(response.encodeRedirectURL(uri));
- }
- else {
+ } else {
doForward(uri, request, response);
}
}
@@ -405,8 +401,7 @@
throws IOException, ServletException {
try {
return (action.execute(mapping, form, request, response));
- }
- catch (Exception e) {
+ } catch (Exception e) {
return (processException(request, response, e, form, mapping));
}
}
@@ -497,11 +492,9 @@
if (exception instanceof IOException) {
throw (IOException) exception;
- }
- else if (exception instanceof ServletException) {
+ } else if (exception instanceof ServletException) {
throw (ServletException) exception;
- }
- else {
+ } else {
throw new ServletException(exception);
}
}
@@ -514,8 +507,7 @@
return (handler.execute(exception, config, mapping, form, request,
response));
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new ServletException(e);
}
}
@@ -676,8 +668,7 @@
if ((contentType != null)
&& contentType.startsWith("multipart/form-data")) {
return (new MultipartRequestWrapper(request));
- }
- else {
+ } else {
return (request);
}
}
@@ -952,8 +943,7 @@
ForwardConfig forward = mapping.findForward(input);
processForwardConfig(request, response, forward);
- }
- else {
+ } else {
internalModuleRelativeForward(input, request, response);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
