You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by ar...@apache.org on 2010/12/15 21:24:02 UTC

svn commit: r1049692 - /myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/ComponentContextManagerImpl.java

Author: arobinson74
Date: Wed Dec 15 20:24:01 2010
New Revision: 1049692

URL: http://svn.apache.org/viewvc?rev=1049692&view=rev
Log:
Fix null pointer exception in log

Modified:
    myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/ComponentContextManagerImpl.java

Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/ComponentContextManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/ComponentContextManagerImpl.java?rev=1049692&r1=1049691&r2=1049692&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/ComponentContextManagerImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/ComponentContextManagerImpl.java Wed Dec 15 20:24:01 2010
@@ -61,16 +61,17 @@ final class ComponentContextManagerImpl
     }
 
     ComponentContextChange change = _stack.poll();
-    if (_stack.isEmpty())
-    {
-      _stack = null;
-    }
 
     if (_LOG.isFine())
     {
       _LOG.fine("Component context change popped from the stack. Popped change: {0}. " +
                 "New head of stack: {1}. New stack size: {2}",
-        new Object[] { change, _stack.peek(), _stack == null ? 0 : _stack.size() });
+        new Object[] { change, _stack.peek(), _stack.size() });
+    }
+
+    if (_stack.isEmpty())
+    {
+      _stack = null;
     }
 
     return change;