Update of /var/cvs/src/org/mmbase/bridge/implementation
In directory james.mmbase.org:/tmp/cvs-serv18875
Modified Files:
ModuleHandler.java
Log Message:
generics
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/implementation
Index: ModuleHandler.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/implementation/ModuleHandler.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- ModuleHandler.java 1 Oct 2008 19:24:28 -0000 1.40
+++ ModuleHandler.java 1 Oct 2008 19:57:36 -0000 1.41
@@ -30,7 +30,7 @@
*
* @author Pierre van Rooden
* @author Rob Vermeulen
- * @version $Id: ModuleHandler.java,v 1.40 2008/10/01 19:24:28 michiel Exp $
+ * @version $Id: ModuleHandler.java,v 1.41 2008/10/01 19:57:36 michiel Exp $
*/
public class ModuleHandler implements Module, InvocationHandler {
private static final Logger log =
Logging.getLoggerInstance(ModuleHandler.class);
@@ -174,13 +174,23 @@
public void process(String command, Object parameter, Map<String, Object>
auxparameters, ServletRequest req, ServletResponse resp){
if (mmbaseModule instanceof ProcessorModule) {
- Map<String, Object> cmds = new Hashtable<String, Object>();
+ Hashtable<String, Object> cmds = new Hashtable<String, Object>();
if (parameter == null) { parameter = "-1"; }
cmds.put(command,parameter);
+ Hashtable<String, Object> hashtable;
+ boolean put = false;
if (auxparameters == null) {
- auxparameters = new Hashtable<String, Object>();
+ hashtable = new Hashtable<String, Object>();
+ } else if (auxparameters instanceof Hashtable) {
+ hashtable = (Hashtable) auxparameters;
+ } else {
+ put = true;
+ hashtable = new Hashtable(auxparameters);
+ }
+ ((ProcessorModule)mmbaseModule).process(new
PageInfo((HttpServletRequest)req, (HttpServletResponse)resp,
getCloud(auxparameters)), cmds, hashtable);
+ if (put) {
+ auxparameters.putAll(hashtable);
}
- ((ProcessorModule)mmbaseModule).process(new
PageInfo((HttpServletRequest)req, (HttpServletResponse)resp,
getCloud(auxparameters)), cmds, auxparameters);
} else {
throw new BridgeException("process() is not supported by this
module.");
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
