[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...

[Gavin King]

  User: gavin   
  Date: 06/10/11 17:27:30

  Modified:    src/main/org/jboss/seam/core   TimeZone.java
                        ConversationEntry.java
  Log:
  oopsy
  
  Revision  Changes    Path
  1.2       +2 -2      jboss-seam/src/main/org/jboss/seam/core/TimeZone.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TimeZone.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/TimeZone.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- TimeZone.java	11 Oct 2006 16:12:34 -0000	1.1
  +++ TimeZone.java	11 Oct 2006 21:27:30 -0000	1.2
  @@ -25,9 +25,9 @@
         return TimeZoneSelector.instance().getTimeZone();
      }
      
  -   public static java.util.Locale instance()
  +   public static java.util.TimeZone instance()
      {
  -      return (java.util.Locale) Component.getInstance(TimeZone.class, ScopeType.STATELESS, true);
  +      return (java.util.TimeZone) Component.getInstance(TimeZone.class, ScopeType.STATELESS, true);
      }
      
   }
  
  
  
  1.20      +2 -1      jboss-seam/src/main/org/jboss/seam/core/ConversationEntry.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConversationEntry.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ConversationEntry.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- ConversationEntry.java	10 Oct 2006 22:09:05 -0000	1.19
  +++ ConversationEntry.java	11 Oct 2006 21:27:30 -0000	1.20
  @@ -35,7 +35,8 @@
      public ConversationEntry(String id, List<String> stack, ConversationEntries parent)
      {
         this.id = id;
  -      this.conversationIdStack = Collections.unmodifiableList(stack);
  +      this.conversationIdStack = stack==null ? 
  +            null : Collections.unmodifiableList(stack);
         this.startDatetime = new Date();
         this.parent = parent;
         touch();