svn commit: r1161978 - /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/TokenCacheDebugUtils.java

[gc...@apache.org]

Author: gcrawford
Date: Fri Aug 26 03:23:20 2011
New Revision: 1161978

URL: http://svn.apache.org/viewvc?rev=1161978&view=rev
Log:
TRINIDAD-2131 Make it easier to debug viewExpiredExceptions

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/TokenCacheDebugUtils.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/TokenCacheDebugUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/TokenCacheDebugUtils.java?rev=1161978&r1=1161977&r2=1161978&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/TokenCacheDebugUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/TokenCacheDebugUtils.java Fri Aug 26 03:23:20 2011
@@ -28,6 +28,7 @@ import javax.faces.context.FacesContext;
 import javax.servlet.http.HttpSession;
 
 import org.apache.myfaces.trinidad.context.RequestContext;
+import org.apache.myfaces.trinidad.context.Window;
 import org.apache.myfaces.trinidad.context.WindowManager;
 
 
@@ -184,8 +185,24 @@ public final class TokenCacheDebugUtils 
     addToRequestStringBuffer("Session Id = " + sessionId);
     
     WindowManager wm = RequestContext.getCurrentInstance().getWindowManager();
-    String windowId = wm.getCurrentWindow(externalContext).getId();
-    addToRequestStringBuffer("\nWindow Id = " + windowId );    
+    if (wm != null)
+    {
+      Window window = wm.getCurrentWindow(externalContext);
+      
+      if (window != null)
+      {
+        addToRequestStringBuffer("\nWindow Id = " + window.getId() );   
+      }
+      else
+      {
+        addToRequestStringBuffer("\nWindow Id could not be determined, window is null" ); 
+      }
+        
+    }
+    else
+    {
+      addToRequestStringBuffer("\nWindow Id could not be determined, window manager null" ); 
+    }
   }  
 
   /**