From ea9085bcc941a5ea566432be42943f0a323a5b63 Mon Sep 17 00:00:00 2001 From: Henri Herscher Date: Mon, 24 Oct 2005 18:46:23 +0000 Subject: Enums now employ uppercase values git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@10 09dcff7a-b715-0410-9601-b79a96267cd0 --- .../sf/oreka/serializers/ServletRequestSerializer.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'orkbasej/java/net/sf/oreka/serializers/ServletRequestSerializer.java') diff --git a/orkbasej/java/net/sf/oreka/serializers/ServletRequestSerializer.java b/orkbasej/java/net/sf/oreka/serializers/ServletRequestSerializer.java index 8eded74..84650bd 100644 --- a/orkbasej/java/net/sf/oreka/serializers/ServletRequestSerializer.java +++ b/orkbasej/java/net/sf/oreka/serializers/ServletRequestSerializer.java @@ -22,7 +22,6 @@ import net.sf.oreka.OrkObjectFactory; public class ServletRequestSerializer extends OrkSerializer { HttpServletRequest request = null; - final String classMarker = "cmd"; public OrkObject deSerialize(HttpServletRequest request) throws OrkException { @@ -30,14 +29,17 @@ public class ServletRequestSerializer extends OrkSerializer { deserialize = true; // Set DeSerialize mode // Instanciate the right object - String classMarker2 = (String)request.getParameterNames().nextElement(); + //String classMarker = (String)request.getParameterNames().nextElement(); String orkClass = null; - if(classMarker2 != null) - { - orkClass = request.getParameter(classMarker2); - } + orkClass = request.getParameter("class"); if(orkClass == null) { - throw (new OrkException("ServletRequestSerializer.deSerialize: where is the command in:" + request.getQueryString())); + orkClass = request.getParameter("cmd"); + if(orkClass == null) { + orkClass = request.getParameter("type"); + } + else { + throw (new OrkException("ServletRequestSerializer.deSerialize: where is the command in:" + request.getQueryString())); + } } OrkObject obj = OrkObjectFactory.instance().newOrkObject(orkClass.toLowerCase()); -- cgit v1.2.3