You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2003/10/24 14:04:16 UTC

cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/workflow CMSHistory.java

andreas     2003/10/24 05:04:16

  Modified:    src/java/org/apache/lenya/cms/workflow CMSHistory.java
  Log:
  checking if <user> elment exists when restoring version
  
  Revision  Changes    Path
  1.21      +5 -3      cocoon-lenya/src/java/org/apache/lenya/cms/workflow/CMSHistory.java
  
  Index: CMSHistory.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/workflow/CMSHistory.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- CMSHistory.java	10 Oct 2003 16:42:12 -0000	1.20
  +++ CMSHistory.java	24 Oct 2003 12:04:16 -0000	1.21
  @@ -230,8 +230,10 @@
   
           Element identityElement = helper.getFirstChild(element, IDENTITY_ELEMENT);
           Element userElement = helper.getFirstChild(identityElement, USER_ELEMENT);
  -        String userId = userElement.getAttribute(ID_ATTRIBUTE);
  -        cmsVersion.setUserId(userId);
  +        if (userElement != null) {
  +        	String userId = userElement.getAttribute(ID_ATTRIBUTE);
  +        	cmsVersion.setUserId(userId);
  +        }
   
           return cmsVersion;
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org