Permalink
Browse files

LPS-26657 Remove change to RestrictPortletServletRequest? I don't see…

… why this is needed. The change to MainServlet is good enough?
  • Loading branch information...
1 parent c3c1248 commit 2c623d5f123c8bd5d8c890f05b8f9b9e71be2263 @brianchandotcom brianchandotcom committed Jul 28, 2012
@@ -16,10 +16,8 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
-import com.liferay.portal.kernel.servlet.NonSerializableObjectHandler;
import com.liferay.portal.kernel.servlet.PersistentHttpServletRequestWrapper;
import com.liferay.portal.kernel.util.Mergeable;
-import com.liferay.portal.kernel.util.ServerDetector;
import com.liferay.portal.kernel.util.WebKeys;
import java.util.Collections;
@@ -47,10 +45,6 @@ public RestrictPortletServletRequest(HttpServletRequest request) {
public Object getAttribute(String name) {
Object value = _attributes.get(name);
- if (ServerDetector.isWebLogic()) {
- value = NonSerializableObjectHandler.getValue(value);
- }
-
if (value == _nullValue) {
return null;
}
@@ -59,13 +53,7 @@ public Object getAttribute(String name) {
return value;
}
- value = super.getAttribute(name);
-
- if (ServerDetector.isWebLogic()) {
- value = NonSerializableObjectHandler.getValue(value);
- }
-
- return value;
+ return super.getAttribute(name);
}
@Override
@@ -86,10 +74,6 @@ public Object getAttribute(String name) {
String key = entry.getKey();
Object value = entry.getValue();
- if (ServerDetector.isWebLogic()) {
- value = NonSerializableObjectHandler.getValue(value);
- }
-
if (value == null) {
names.remove(key);
}
@@ -138,10 +122,6 @@ public void setAttribute(String name, Object value) {
value = _nullValue;
}
- if (ServerDetector.isWebLogic()) {
- value = new NonSerializableObjectHandler(value);
- }
-
_attributes.put(name, value);
}
@@ -150,10 +130,6 @@ protected void doMergeSharedAttributes(ServletRequest servletRequest) {
String name = entry.getKey();
Object value = entry.getValue();
- if (ServerDetector.isWebLogic()) {
- value = NonSerializableObjectHandler.getValue(value);
- }
-
doMergeSharedAttributes(servletRequest, name, value);
}
}
@@ -172,11 +148,6 @@ protected void doMergeSharedAttributes(
else {
Object masterValue = servletRequest.getAttribute(name);
- if (ServerDetector.isWebLogic()) {
- masterValue = NonSerializableObjectHandler.getValue(
- masterValue);
- }
-
if ((masterValue == null) || !(value instanceof Mergeable)) {
servletRequest.setAttribute(name, value);

0 comments on commit 2c623d5

Please sign in to comment.