Update of /var/cvs/src/org/mmbase/framework
In directory james.mmbase.org:/tmp/cvs-serv8051
Modified Files:
AbstractRenderer.java ConnectionRenderer.java
ErrorRenderer.java FrameworkFilter.java
Log Message:
various details
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework
Index: AbstractRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/AbstractRenderer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- AbstractRenderer.java 25 Aug 2008 17:56:54 -0000 1.12
+++ AbstractRenderer.java 25 Aug 2008 21:45:19 -0000 1.13
@@ -21,7 +21,7 @@
* Abstract renderer implementation which implements getType and getBlock.
*
* @author Michiel Meeuwissen
- * @version $Id: AbstractRenderer.java,v 1.12 2008/08/25 17:56:54 michiel Exp $
+ * @version $Id: AbstractRenderer.java,v 1.13 2008/08/25 21:45:19 michiel Exp $
* @since MMBase-1.9
*/
abstract public class AbstractRenderer implements Renderer {
@@ -53,7 +53,10 @@
}
protected void decorateIntro(HttpServletRequest request, Writer w, String
extraClass) throws IOException {
- w.write("<div id=\"" +
request.getAttribute(Framework.COMPONENT_ID_KEY) + "\"");
+ if (request == null) {
+ log.warn("No request found, could not set ID, CLASS", new
Exception());
+ }
+ w.write("<div id=\"" + (request == null ? "" :
request.getAttribute(Framework.COMPONENT_ID_KEY) )+ "\"");
w.write(" class=\"");
if (extraClass != null) {
w.write(extraClass);
@@ -63,7 +66,7 @@
w.write(getBlock().getComponent().getName());
w.write(" b_");
w.write(getBlock().getName());
- w.write(" " + request.getAttribute(Framework.COMPONENT_CLASS_KEY));
+ w.write(" " + (request == null ? "" :
request.getAttribute(Framework.COMPONENT_CLASS_KEY)));
w.write("\">");
}
protected void decorateOutro(HttpServletRequest request, Writer w) throws
IOException {
Index: ConnectionRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/ConnectionRenderer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ConnectionRenderer.java 25 Aug 2008 17:56:54 -0000 1.6
+++ ConnectionRenderer.java 25 Aug 2008 21:45:19 -0000 1.7
@@ -45,7 +45,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: ConnectionRenderer.java,v 1.6 2008/08/25 17:56:54 michiel Exp
$
+ * @version $Id: ConnectionRenderer.java,v 1.7 2008/08/25 21:45:19 michiel Exp
$
* @since MMBase-1.9
*/
public class ConnectionRenderer extends AbstractRenderer {
@@ -75,9 +75,8 @@
decorate = d;
}
-
public Parameter[] getParameters() {
- return new Parameter[] {};
+ return new Parameter[] {Parameter.REQUEST}; // hmm.
}
@@ -86,8 +85,11 @@
Writer w, WindowState state) throws FrameworkException {
+ if (w == null) throw new NullPointerException();
try {
- log.info("Rendering with " + blockParameters);
+ if (log.isDebugEnabled()) {
+ log.debug("Rendering with " + blockParameters);
+ }
if (decorate) {
HttpServletRequest request =
blockParameters.get(Parameter.REQUEST);
decorateIntro(request, w, null);
@@ -99,6 +101,7 @@
String contentType = connection.getContentType();
InputStream inputStream = connection.getInputStream();
if (responseCode == 200) {
+ log.debug("" + xsl);
if (xsl == null) {
String encoding =
GenericResponseWrapper.getEncoding(contentType);
BufferedReader r = new BufferedReader(new
InputStreamReader(inputStream, encoding));
@@ -118,6 +121,7 @@
} else {
+ log.debug("" + responseCode);
throw new FrameworkException("" + responseCode);
}
} catch (java.net.ConnectException ce) {
@@ -128,13 +132,22 @@
throw new FrameworkException(ioe.getMessage(), ioe);
} catch (javax.xml.transform.TransformerException te) {
throw new FrameworkException(te.getMessage(), te);
+ } catch (RuntimeException e) {
+ log.debug(e.getMessage(), e);
+ throw e;
+ } catch(FrameworkException fe) {
+ log.debug(fe.getMessage(), fe);
+ throw fe;
} finally {
if (decorate) {
+ log.debug("Decorating");
try {
HttpServletRequest request =
blockParameters.get(Parameter.REQUEST);
decorateOutro(request, w);
} catch (Exception e) {
}
+ } else {
+ log.debug("no decoration");
}
}
Index: ErrorRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/ErrorRenderer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- ErrorRenderer.java 25 Apr 2008 14:31:39 -0000 1.12
+++ ErrorRenderer.java 25 Aug 2008 21:45:19 -0000 1.13
@@ -28,7 +28,7 @@
* share code.
*
* @author Michiel Meeuwissen
- * @version $Id: ErrorRenderer.java,v 1.12 2008/04/25 14:31:39 andre Exp $
+ * @version $Id: ErrorRenderer.java,v 1.13 2008/08/25 21:45:19 michiel Exp $
* @since MMBase-1.9
*/
@@ -55,6 +55,7 @@
}
public void render(Parameters blockParameters, Parameters
frameworkParameters, Writer w, Renderer.WindowState state) throws
FrameworkException {
+ log.debug("Error rendering " + blockParameters + " " +
frameworkParameters);
switch(getType()) {
case BODY:
try {
Index: FrameworkFilter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/FrameworkFilter.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- FrameworkFilter.java 25 Aug 2008 17:56:54 -0000 1.29
+++ FrameworkFilter.java 25 Aug 2008 21:45:19 -0000 1.30
@@ -36,7 +36,7 @@
* 'excludes' parameter in web.xml.
*
* @author André van Toly
- * @version $Id: FrameworkFilter.java,v 1.29 2008/08/25 17:56:54 michiel Exp $
+ * @version $Id: FrameworkFilter.java,v 1.30 2008/08/25 21:45:19 michiel Exp $
*/
public class FrameworkFilter implements Filter, MMBaseStarter {
@@ -194,7 +194,7 @@
log.debug("** response committed, including");
rd.include(request, response);
}else{
- log.debug("** respone not committed, forwarding");
+ log.debug("** response not committed, forwarding");
rd.forward(request, response);
}
} else {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
