You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mb...@apache.org on 2007/08/14 02:09:29 UTC
svn commit: r565582 -
/commons/proper/el/trunk/src/java/org/apache/commons/el/VariableResolverImpl.java
Author: mbenson
Date: Mon Aug 13 17:09:28 2007
New Revision: 565582
URL: http://svn.apache.org/viewvc?view=rev&rev=565582
Log:
unnecessary elses
Modified:
commons/proper/el/trunk/src/java/org/apache/commons/el/VariableResolverImpl.java
Modified: commons/proper/el/trunk/src/java/org/apache/commons/el/VariableResolverImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/el/trunk/src/java/org/apache/commons/el/VariableResolverImpl.java?view=diff&rev=565582&r1=565581&r2=565582
==============================================================================
--- commons/proper/el/trunk/src/java/org/apache/commons/el/VariableResolverImpl.java (original)
+++ commons/proper/el/trunk/src/java/org/apache/commons/el/VariableResolverImpl.java Mon Aug 13 17:09:28 2007
@@ -56,35 +56,42 @@
// Check for implicit objects
if ("pageContext".equals(pName)) {
return mCtx;
- } else if ("pageScope".equals(pName)) {
+ }
+ if ("pageScope".equals(pName)) {
return ImplicitObjects.getImplicitObjects(mCtx).getPageScopeMap();
- } else if ("requestScope".equals(pName)) {
+ }
+ if ("requestScope".equals(pName)) {
return ImplicitObjects.getImplicitObjects(mCtx)
.getRequestScopeMap();
- } else if ("sessionScope".equals(pName)) {
+ }
+ if ("sessionScope".equals(pName)) {
return ImplicitObjects.getImplicitObjects(mCtx)
.getSessionScopeMap();
- } else if ("applicationScope".equals(pName)) {
+ }
+ if ("applicationScope".equals(pName)) {
return ImplicitObjects.getImplicitObjects(mCtx)
.getApplicationScopeMap();
- } else if ("param".equals(pName)) {
+ }
+ if ("param".equals(pName)) {
return ImplicitObjects.getImplicitObjects(mCtx).getParamMap();
- } else if ("paramValues".equals(pName)) {
+ }
+ if ("paramValues".equals(pName)) {
return ImplicitObjects.getImplicitObjects(mCtx).getParamsMap();
- } else if ("header".equals(pName)) {
+ }
+ if ("header".equals(pName)) {
return ImplicitObjects.getImplicitObjects(mCtx).getHeaderMap();
- } else if ("headerValues".equals(pName)) {
+ }
+ if ("headerValues".equals(pName)) {
return ImplicitObjects.getImplicitObjects(mCtx).getHeadersMap();
- } else if ("initParam".equals(pName)) {
+ }
+ if ("initParam".equals(pName)) {
return ImplicitObjects.getImplicitObjects(mCtx).getInitParamMap();
- } else if ("cookie".equals(pName)) {
+ }
+ if ("cookie".equals(pName)) {
return ImplicitObjects.getImplicitObjects(mCtx).getCookieMap();
}
-
// Otherwise, just look it up in the page context
- else {
- return mCtx.findAttribute(pName);
- }
+ return mCtx.findAttribute(pName);
}
// -------------------------------------