You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by rm...@apache.org on 2012/10/17 15:21:47 UTC

svn commit: r1399226 - in /incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet: ImageLookup.java ServletRequestContext.java

Author: rmatthews
Date: Wed Oct 17 13:21:46 2012
New Revision: 1399226

URL: http://svn.apache.org/viewvc?rev=1399226&view=rev
Log:
Improved debug information being made available.

Modified:
    incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java
    incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ServletRequestContext.java

Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java?rev=1399226&r1=1399225&r2=1399226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java Wed Oct 17 13:21:46 2012
@@ -31,7 +31,6 @@ import javax.servlet.ServletContext;
 import org.apache.log4j.Logger;
 
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 

Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ServletRequestContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ServletRequestContext.java?rev=1399226&r1=1399225&r2=1399226&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ServletRequestContext.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ServletRequestContext.java Wed Oct 17 13:21:46 2012
@@ -61,6 +61,7 @@ public class ServletRequestContext exten
          * view.divider("System"); Runtime.getRuntime().
          */
         view.startSection("HTTP Serviet Request");
+        view.appendTitle("General");
         view.appendln("Auth type", request.getAuthType());
         view.appendln("Character encoding", request.getCharacterEncoding());
         view.appendln("Class", request.getClass());
@@ -84,12 +85,15 @@ public class ServletRequestContext exten
         view.appendln("URL", request.getRequestURL());
         view.appendln("User principle", request.getUserPrincipal());
 
-        view.appendTitle("Cookies");
+        
         final Cookie[] cookies = request.getCookies();
-        for (final Cookie cookie : cookies) {
-            view.appendln(cookie.getName(), cookie.getValue());
+        if (cookies != null) {
+            view.appendTitle("Cookies");
+            for (final Cookie cookie : cookies) {
+                view.appendln(cookie.getName(), cookie.getValue());
+            }
         }
-
+        
         final Enumeration attributeNames = request.getAttributeNames();
         if (attributeNames.hasMoreElements()) {
             view.appendTitle("Attributes");