antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

* Be more careful about throwing exception in RequestTrans.set().

Browse source 
* Remove spurious System.err.println().
This commit is contained in:
hns 2007-07-05 16:32:06 +00:00
parent 8579a68675
commit 4bf021d45b
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/helma/framework/RequestTrans.java
View file

@ -600,7 +600,7 @@ public class RequestTrans implements Serializable {
} }
} }
Object previous = super.get(key); Object previous = super.get(key);
if (previous != null && (!(previous instanceof Object[]) || !(value instanceof Object[]))) if (previous != null && (previous instanceof Map || value instanceof Map))
throw new RuntimeException("Conflicting HTTP Parameters for '" + key + "'"); throw new RuntimeException("Conflicting HTTP Parameters for '" + key + "'");
return super.put(key, value); return super.put(key, value);
} }
@ -620,7 +620,7 @@ public class RequestTrans implements Serializable {
String partName = matcher.group(1); String partName = matcher.group(1);
return map.putInternal(partName, matcher, value); return map.putInternal(partName, matcher, value);
} }
if (previous != null && (!(previous instanceof Object[]) || !(value instanceof Object[]))) if (previous != null && (previous instanceof Map || value instanceof Map))
throw new RuntimeException("Conflicting HTTP Parameters for '" + name + "'"); throw new RuntimeException("Conflicting HTTP Parameters for '" + name + "'");
return super.put(name, value); return super.put(name, value);
} }
@ -633,7 +633,6 @@ public class RequestTrans implements Serializable {
value = super.get(name.substring(0, name.length() - 6)); value = super.get(name.substring(0, name.length() - 6));
return value instanceof Object[] ? value : null; return value instanceof Object[] ? value : null;
} else if (name.endsWith("_cookie") && value == null) { } else if (name.endsWith("_cookie") && value == null) {
System.err.println(" *** *** *** " + name.substring(0, name.length() - 7));
value = super.get(name.substring(0, name.length() - 7)); value = super.get(name.substring(0, name.length() - 7));
return value instanceof Cookie ? value : null; return value instanceof Cookie ? value : null;
} else if (value instanceof Object[]) { } else if (value instanceof Object[]) {